Skip to content

Commit df5ee33

Browse files
authored
[Telink] Update Docker image (Zephyr SDK update) (#37357)
* [Telink] Manual Zephyr SDK update to check CI jobs * [Telink] Update Zephyr revision & remove dev changes * typo
1 parent f2339f8 commit df5ee33

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
111 : [Android] Update android sdk and java version
1+
112 : [Telink] Update Docker image (Zephyr SDK update)

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ RUN set -x \
1111
# Setup toolchain
1212
WORKDIR /opt/telink
1313
RUN set -x \
14-
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
15-
&& tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
16-
&& rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
17-
&& zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \
14+
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
15+
&& tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
16+
&& rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
17+
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
1818
&& : # last line
1919

2020
# Setup Zephyr
21-
ARG ZEPHYR_REVISION=52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d
21+
ARG ZEPHYR_REVISION=ce4027fc0768b8509758af2e43f74e3fd2c7d58d
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \
@@ -34,7 +34,7 @@ RUN set -x \
3434

3535
FROM ghcr.io/project-chip/chip-build:${VERSION}
3636

37-
COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
37+
COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/
3838
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
3939

4040
RUN set -x \
@@ -45,4 +45,4 @@ RUN set -x \
4545
&& : # last line
4646

4747
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
48-
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
48+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
3838
COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox
3939

4040
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
41-
COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1
41+
COPY --from=telink /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0
4242

4343
COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
4444

@@ -126,7 +126,7 @@ ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
126126
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
127127
ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
128128
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
129-
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
129+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
130130
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1
131131
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
132132
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.17.0

0 commit comments

Comments
 (0)