Skip to content

Commit bb2c574

Browse files
authored
[NXP] Migrate docker image to NXP Zephyr 3.7 downstream release (#35599)
Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com>
1 parent 1dacd5d commit bb2c574

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
76 : [Telink] Update Docker image (Zephyr update)
1+
77 : [NXP] Migrate docker image to NXP Zephyr 3.7 downstream release

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ RUN set -x \
1010

1111
WORKDIR /opt/nxp-zephyr
1212
RUN set -x \
13-
&& wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.5/zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
14-
&& tar xvf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
15-
&& rm -rf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
16-
&& zephyr-sdk-0.16.5/setup.sh -t arm-zephyr-eabi \
13+
&& wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \
14+
&& tar xvf zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \
15+
&& rm -rf zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \
16+
&& zephyr-sdk-0.16.8/setup.sh -t arm-zephyr-eabi \
1717
&& pip3 install --break-system-packages -U --no-cache-dir west \
18-
&& west init zephyrproject -m https://github.com/nxp-zephyr-ear/zephyr.git --mr zephyr_rw61x_v3.6_RFP \
19-
&& cd zephyrproject/zephyr \
18+
&& west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v3.7.0 \
19+
&& cd zephyrproject \
2020
&& west update -o=--depth=1 -n \
2121
&& west zephyr-export \
2222
&& : # last line
2323

2424
FROM ghcr.io/project-chip/chip-build:${VERSION}
2525

26-
COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.16.5/ /opt/nxp-zephyr/zephyr-sdk-0.16.5/
26+
COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/
2727
COPY --from=build /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
2828

2929
WORKDIR /opt/nxp-zephyr
3030

3131
ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
32-
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.5
32+
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ COPY --from=rw61x /opt/sdk /opt/nxp-sdk
5454

5555
COPY --from=nxp /opt/nxp /opt/nxp
5656

57-
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.5/ /opt/nxp-zephyr/zephyr-sdk-0.16.5/
57+
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/
5858
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
5959

6060
COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
@@ -140,7 +140,7 @@ ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
140140
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5
141141
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
142142
ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
143-
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.5
143+
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8
144144
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
145145

146146
# Places bootstrap files there instead of the default one which is `.environment`.

0 commit comments

Comments
 (0)