[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>
diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
index 0559460..8921a55 100644
--- a/.github/workflows/docker_img.yaml
+++ b/.github/workflows/docker_img.yaml
@@ -101,7 +101,7 @@
# 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
# - "-imx"
- "-java"
- - "-k32w"
+ - "-nxp"
- "-nrf-platform"
- "-telink"
- "-ti"
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
index 40d2e33..13023b6 100644
--- a/.github/workflows/examples-nxp.yaml
+++ b/.github/workflows/examples-nxp.yaml
@@ -39,7 +39,7 @@
if: github.actor != 'restyled-io[bot]'
container:
- image: ghcr.io/project-chip/chip-build-k32w:80
+ image: ghcr.io/project-chip/chip-build-nxp:80
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/examples/contact-sensor-app/nxp/k32w0/BUILD.gn b/examples/contact-sensor-app/nxp/k32w0/BUILD.gn
index c51b878..f032603 100644
--- a/examples/contact-sensor-app/nxp/k32w0/BUILD.gn
+++ b/examples/contact-sensor-app/nxp/k32w0/BUILD.gn
@@ -199,12 +199,17 @@
output_name = "bignsign.log"
outputs = [ "${root_build_dir}/${output_name}" ]
+ args = [
+ "--sdk-root",
+ rebase_path(k32w0_sdk_root),
+ ]
+
if (chip_simple_hash_verification == 1) {
- args = [ "--simple-hash" ]
+ args += [ "--simple-hash" ]
}
if (chip_enable_ota_requestor) {
- args = [ "--ota-enabled" ]
+ args += [ "--ota-enabled" ]
}
}
diff --git a/examples/lighting-app/nxp/k32w0/BUILD.gn b/examples/lighting-app/nxp/k32w0/BUILD.gn
index a63a596..65a6222 100644
--- a/examples/lighting-app/nxp/k32w0/BUILD.gn
+++ b/examples/lighting-app/nxp/k32w0/BUILD.gn
@@ -180,12 +180,17 @@
output_name = "bignsign.log"
outputs = [ "${root_build_dir}/${output_name}" ]
+ args = [
+ "--sdk-root",
+ rebase_path(k32w0_sdk_root),
+ ]
+
if (chip_simple_hash_verification == 1) {
- args = [ "--simple-hash" ]
+ args += [ "--simple-hash" ]
}
if (chip_enable_ota_requestor) {
- args = [ "--ota-enabled" ]
+ args += [ "--ota-enabled" ]
}
}
diff --git a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile b/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile
deleted file mode 100644
index c4cf719..0000000
--- a/integrations/docker/images/stage-2/chip-build-k32w/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-ARG VERSION=1
-FROM ghcr.io/project-chip/chip-build:${VERSION} as build
-LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
-
-RUN set -x \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
- unzip \
- wget \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/ \
- && : # last line
-
-WORKDIR /opt/sdk
-
-RUN set -x \
- && python3 -m pip install --break-system-packages -U --no-cache-dir west==1.2.0 \
- && : # last line
-
-RUN set -x \
- && west init -m https://github.com/nxp-mcuxpresso/mcux-sdk --mr "MCUX_2.6.14_K32W0" \
- && west update -o=--depth=1 -n -f smart \
- && chmod +x core/tools/imagetool/sign_images.sh \
- && ln -sf ../rtos core \
- && ln -sf ../middleware core \
- && cp -R examples/* core/boards && rm -rf examples \
- && : # last line
-
-FROM ghcr.io/project-chip/chip-build:${VERSION}
-
-COPY --from=build /opt/sdk/ /opt/sdk/
-
-ENV NXP_K32W0_SDK_ROOT=/opt/sdk/core
diff --git a/integrations/docker/images/stage-2/chip-build-k32w/build.sh b/integrations/docker/images/stage-2/chip-build-k32w/build.sh
deleted file mode 120000
index 46b2031..0000000
--- a/integrations/docker/images/stage-2/chip-build-k32w/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../build.sh
\ No newline at end of file
diff --git a/integrations/docker/images/stage-2/chip-build-k32w/run.sh b/integrations/docker/images/stage-2/chip-build-k32w/run.sh
deleted file mode 120000
index 9bbfad8..0000000
--- a/integrations/docker/images/stage-2/chip-build-k32w/run.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../run.sh
\ No newline at end of file
diff --git a/integrations/docker/images/stage-2/chip-build-k32w/version b/integrations/docker/images/stage-2/chip-build-k32w/version
deleted file mode 120000
index a40ba48..0000000
--- a/integrations/docker/images/stage-2/chip-build-k32w/version
+++ /dev/null
@@ -1 +0,0 @@
-../../base/chip-build/version
\ No newline at end of file
diff --git a/third_party/nxp/nxp_matter_support b/third_party/nxp/nxp_matter_support
index b2855d3..e46fdce 160000
--- a/third_party/nxp/nxp_matter_support
+++ b/third_party/nxp/nxp_matter_support
@@ -1 +1 @@
-Subproject commit b2855d3e28556d145889fdba889fba286c60a93f
+Subproject commit e46fdce014aef075c68a62cbd87e4a6791edd392
