Skip to content

Commit 04df270

Browse files
committed
[NXP] Updating vscode docker img to remove unused nxp platforms
+ adding variable to get NXP SDK PATH location Signed-off-by: Gatien Chapon <gatien.chapon@nxp.com>
1 parent a02653f commit 04df270

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

integrations/docker/images/stage-2/chip-build-nxp/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ FROM ghcr.io/project-chip/chip-build:${VERSION}
2424

2525
COPY --from=build /opt/nxp/ /opt/nxp/
2626

27+
ENV NXP_SDK_PATH=/opt/nxp
2728
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+1-9
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS psoc6
99
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen
1010
FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
1111
FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba
12-
FROM ghcr.io/project-chip/chip-build-k32w:${VERSION} AS k32w
13-
FROM ghcr.io/project-chip/chip-build-rw61x:${VERSION} AS rw61x
1412
FROM ghcr.io/project-chip/chip-build-nxp:${VERSION} AS nxp
1513
FROM ghcr.io/project-chip/chip-build-nxp-zephyr:${VERSION} AS nxpzephyr
1614
FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx
@@ -48,10 +46,6 @@ COPY --from=crosscompile /opt/ubuntu-22.04.1-aarch64-sysroot /opt/ubuntu-22.04.1
4846

4947
COPY --from=ameba /opt/ameba /opt/ameba
5048

51-
COPY --from=k32w /opt/sdk /opt/k32w
52-
53-
COPY --from=rw61x /opt/sdk /opt/nxp-sdk
54-
5549
COPY --from=nxp /opt/nxp /opt/nxp
5650

5751
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/
@@ -126,9 +120,6 @@ ENV IDF_TOOLS_PATH=/opt/espressif/tools
126120
ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/6.1-langdale
127121
ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
128122
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
129-
ENV NXP_K32W0_SDK_ROOT=/opt/k32w/core
130-
ENV NXP_K32W1_SDK_ROOT=/opt/k32w/k32w1
131-
ENV NXP_SDK_ROOT=/opt/nxp-sdk/rw61x
132123
ENV OPENOCD_PATH=/opt/openocd/
133124
ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
134125
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
@@ -142,6 +133,7 @@ ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
142133
ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
143134
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8
144135
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
136+
ENV NXP_SDK_PATH=/opt/nxp
145137

146138
# Places bootstrap files there instead of the default one which is `.environment`.
147139
# NOTE: This directory is NOT persistent.

0 commit comments

Comments
 (0)