Skip to content

Commit ba7c3e0

Browse files
authoredSep 30, 2024··
[NXP] Deprecate chip-build-k32w image (#35822)
* [NXP] Bump nxp_matter_support Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP] Switch k32w0 workflow to common NXP image - deprecate chip-build-k32w docker image Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP] Pass k32w0_sdk_root as input to sign script Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [workflow] Replace chip-build-k32w with chip-build-nxp Signed-off-by: marius-alex-tache <marius.tache@nxp.com> --------- Signed-off-by: marius-alex-tache <marius.tache@nxp.com>
1 parent c6ad5b1 commit ba7c3e0

File tree

9 files changed

+17
-43
lines changed

9 files changed

+17
-43
lines changed
 

‎.github/workflows/docker_img.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
# ApplyLayer exit status 1 stdout: stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device
102102
# - "-imx"
103103
- "-java"
104-
- "-k32w"
104+
- "-nxp"
105105
- "-nrf-platform"
106106
- "-telink"
107107
- "-ti"

‎.github/workflows/examples-nxp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-k32w:80
42+
image: ghcr.io/project-chip/chip-build-nxp:80
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎examples/contact-sensor-app/nxp/k32w0/BUILD.gn

+7-2
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,17 @@ action("binsign") {
199199
output_name = "bignsign.log"
200200
outputs = [ "${root_build_dir}/${output_name}" ]
201201

202+
args = [
203+
"--sdk-root",
204+
rebase_path(k32w0_sdk_root),
205+
]
206+
202207
if (chip_simple_hash_verification == 1) {
203-
args = [ "--simple-hash" ]
208+
args += [ "--simple-hash" ]
204209
}
205210

206211
if (chip_enable_ota_requestor) {
207-
args = [ "--ota-enabled" ]
212+
args += [ "--ota-enabled" ]
208213
}
209214
}
210215

‎examples/lighting-app/nxp/k32w0/BUILD.gn

+7-2
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,17 @@ action("binsign") {
180180
output_name = "bignsign.log"
181181
outputs = [ "${root_build_dir}/${output_name}" ]
182182

183+
args = [
184+
"--sdk-root",
185+
rebase_path(k32w0_sdk_root),
186+
]
187+
183188
if (chip_simple_hash_verification == 1) {
184-
args = [ "--simple-hash" ]
189+
args += [ "--simple-hash" ]
185190
}
186191

187192
if (chip_enable_ota_requestor) {
188-
args = [ "--ota-enabled" ]
193+
args += [ "--ota-enabled" ]
189194
}
190195
}
191196

‎integrations/docker/images/stage-2/chip-build-k32w/Dockerfile

-33
This file was deleted.

‎integrations/docker/images/stage-2/chip-build-k32w/build.sh

-1
This file was deleted.

‎integrations/docker/images/stage-2/chip-build-k32w/run.sh

-1
This file was deleted.

‎integrations/docker/images/stage-2/chip-build-k32w/version

-1
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.