From 3667573960eb00327ac48a71023ae3f1312ad9fb Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Wed, 5 Jul 2023 15:31:30 +0300 Subject: [PATCH] [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 --- .../docker/images/chip-build-telink/Dockerfile | 18 +++++++++--------- .../docker/images/chip-build-vscode/Dockerfile | 4 ++-- integrations/docker/images/chip-build/version | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integrations/docker/images/chip-build-telink/Dockerfile b/integrations/docker/images/chip-build-telink/Dockerfile index f3917624957d46..c81581cd5b3066 100644 --- a/integrations/docker/images/chip-build-telink/Dockerfile +++ b/integrations/docker/images/chip-build-telink/Dockerfile @@ -13,21 +13,21 @@ RUN set -x \ 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 @@ RUN set -x \ 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 a25d78bcfa4fb5..ddbfa8aac6d54b 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -36,7 +36,7 @@ COPY --from=mbedos /opt/openocd/ /opt/openocd/ 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=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa 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 88b95cb83f35c2..1b5aec588eaf72 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)