Skip to content

Commit 6082634

Browse files
s07641069pull[bot]
authored andcommitted
[Telink] Update Telink Docker with latest Telink Zephyr (SDK 0.15.2). (#23778)
1 parent 4965448 commit 6082634

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

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

+15-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@ RUN set -x \
1111

1212
# Setup toolchain
1313
RUN set -x \
14-
&& wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.13.2/zephyr-toolchain-riscv64-0.13.2-linux-x86_64-setup.run -O /tmp/zephyr-toolchain-riscv64-setup.run \
15-
&& chmod +x /tmp/zephyr-toolchain-riscv64-setup.run \
16-
&& /tmp/zephyr-toolchain-riscv64-setup.run -- -d /opt/telink/zephyr-sdk-0.13.2 \
14+
&& mkdir /opt/telink \
15+
&& cd /opt/telink \
16+
&& wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
17+
&& wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/sha256.sum | shasum --check --ignore-missing \
18+
&& tar xvf zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
19+
&& rm -rf zephyr-sdk-0.15.2_linux-x86_64.tar.gz \
20+
&& cd zephyr-sdk-0.15.2 \
21+
&& ./setup.sh -t riscv64-zephyr-elf -h -c \
22+
&& cd / \
1723
&& : # last line
1824

1925
# Setup Zephyr
20-
ARG ZEPHYR_REVISION=dac17979d626bb820268660b4272a56d04d8083b
26+
ARG ZEPHYR_REVISION=2901439a086f8202e63dc6f66a590021bb8e15d3
2127
WORKDIR /opt/telink/zephyrproject
2228
RUN set -x \
2329
&& python3 -m pip install -U --no-cache-dir \
@@ -29,16 +35,19 @@ RUN set -x \
2935
&& west init -l \
3036
&& cd .. \
3137
&& west update -o=--depth=1 -n -f smart \
38+
&& cd modules/hal/telink \
39+
&& git submodule update --init \
40+
&& cd ../../../ \
3241
&& west zephyr-export \
3342
&& : # last line
3443

3544
FROM connectedhomeip/chip-build:${VERSION}
3645

37-
COPY --from=build /opt/telink/zephyr-sdk-0.13.2/ /opt/telink/zephyr-sdk-0.13.2/
46+
COPY --from=build /opt/telink/zephyr-sdk-0.15.2/ /opt/telink/zephyr-sdk-0.15.2/
3847
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
3948

4049
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
41-
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.13.2
50+
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.15.2
4251

4352
RUN set -x \
4453
&& apt-get update \

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY --from=mbedos /opt/openocd/ /opt/openocd/
3434
COPY --from=p6 /opt/ModusToolbox /opt/ModusToolbox
3535

3636
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
37-
COPY --from=telink /opt/telink/zephyr-sdk-0.13.2 /opt/telink/zephyr-sdk-0.13.2
37+
COPY --from=telink /opt/telink/zephyr-sdk-0.15.2 /opt/telink/zephyr-sdk-0.15.2
3838

3939
COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
4040

@@ -102,7 +102,7 @@ ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
102102
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
103103
ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
104104
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
105-
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.13.2
105+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.15.2
106106
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0
107107
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
108108
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.15 Version bump reason: Updating ZAP to v2022.11.29-nightly
1+
0.6.16 Version bump reason: [Telink] Update Telink Docker with latest Telink Zephyr (SDK 0.15.2).

0 commit comments

Comments
 (0)