[Telink] Update Docker image (#27499)
* [Telink] Update Docker image
* [Telink] set correct sdk link
* [Telink] Update Zephyr SDK version for chip-build-vscode
* [Telink] Use minimal Zephyr SDK version & update west version
* [Telink] Update flash driver
diff --git a/integrations/docker/images/chip-build-telink/Dockerfile b/integrations/docker/images/chip-build-telink/Dockerfile
index f391762..c81581c 100644
--- a/integrations/docker/images/chip-build-telink/Dockerfile
+++ b/integrations/docker/images/chip-build-telink/Dockerfile
@@ -13,21 +13,21 @@
RUN set -x \
&& mkdir /opt/telink \
&& cd /opt/telink \
- && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
- && wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/sha256.sum | shasum --check --ignore-missing \
- && tar xvf zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
- && rm -rf zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
- && cd zephyr-sdk-0.15.2 \
+ && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+ && wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/sha256.sum | shasum --check --ignore-missing \
+ && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+ && rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+ && cd zephyr-sdk-0.16.1 \
&& ./setup.sh -t riscv64-zephyr-elf -h -c \
&& cd / \
&& : # last line
# Setup Zephyr
-ARG ZEPHYR_REVISION=873afebff10dc02ec881e2432a885e54c9f67b10
+ARG ZEPHYR_REVISION=6bd9f0efd2d31a80fab550c2ea31f101c53c0946
WORKDIR /opt/telink/zephyrproject
RUN set -x \
&& python3 -m pip install -U --no-cache-dir \
- west==0.12.0 \
+ west==1.0.0 \
imgtool==1.7.0 \
&& git clone https://github.com/telink-semi/zephyr \
&& cd zephyr \
@@ -41,11 +41,11 @@
FROM connectedhomeip/chip-build:${VERSION}
-COPY --from=build /opt/telink/zephyr-sdk-0.15.2/ /opt/telink/zephyr-sdk-0.15.2/
+COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.15.2
+ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.16.1
RUN set -x \
&& apt-get update \
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index a25d78b..ddbfa8a 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -36,7 +36,7 @@
COPY --from=p6 /opt/ModusToolbox /opt/ModusToolbox
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
-COPY --from=telink /opt/telink/zephyr-sdk-0.15.2 /opt/telink/zephyr-sdk-0.15.2
+COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1
COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
@@ -107,7 +107,7 @@
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
-ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.15.2
+ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 88b95cb..1b5aec5 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.23 Version bump reason: make slc-cli not use requirements.txt for efr32
+0.7.24 Version bump reason: [Telink] Update Docker image (Zephyr update)
