project-chip · andy31415 · Mar 4, 2025 · Mar 3, 2025 · Mar 4, 2025 · andy31415
diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -105,6 +105,7 @@ jobs:
                     - "-nxp-zephyr"
                     - "-nrf-platform"
                     - "-telink"
+                    - "-telink-zephyr_3_3"
                     - "-ti"
                     - "-tizen"
                     - "-openiotsdk"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -67,5 +67,6 @@ stm32/                           @STYoannZamaron
 
 telink/                          @s07641069
 chip-build-telink/               @s07641069
+chip-build-telink-zephyr_3_3/    @s07641069
 
 webos/                           @joonhaengHeo
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -175,7 +175,7 @@ be useful for quick filtering like `[TC-ABC-1.2]` to tag test changes.
 Examples of descriptive titles:
 
 -   `[Silabs] Fix compile of SiWx917 if LED and BUTTON are disabled`
--   `[Telink] Update build Dockerfile with new Zeprhy SHA: c05c4.....`
+-   `[Telink] Update build Dockerfile with new Zephyr SHA: c05c4.....`
 -   `General Commissioning Cluster: use AttributeAccessInterface/CommandHandlerInterface for processing`
 -   `Scenes Management/CopyScene: set access as manage instead of default to match the spec`
 -   `Fix build errors due to ChipDeviceEvent default constructor not being available`

diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-120 : [NXP] Update NXP sdk version
+121 : [Telink] Update Docker image (Zephyr 3.3 & 3.7 support)
@@ -0,0 +1,48 @@
+ARG VERSION=1
+FROM ghcr.io/project-chip/chip-build:${VERSION} as build
+LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
+
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
+    xz-utils \
+    && : # last line
+
+# Setup toolchain
+WORKDIR /opt/telink
+RUN set -x \
+    && 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 \
+    && tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
+    && rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
+    && zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
+    && : # last line
+
+# Setup Zephyr version: 3.3.0; branch: develop_3.3
+ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
+WORKDIR /opt/telink/zephyrproject
+RUN set -x \
+    && python3 -m pip install --break-system-packages -U --no-cache-dir west \
+    && git init zephyr \
+    && cd zephyr \
+    && git remote add origin https://github.com/telink-semi/zephyr \
+    && git fetch --depth=1 origin ${ZEPHYR_REVISION} \
+    && git reset ${ZEPHYR_REVISION} --hard \
+    && west init -l \
+    && west update -o=--depth=1 -n -f smart \
+    && west blobs fetch hal_telink \
+    && : # last line
+
+FROM ghcr.io/project-chip/chip-build:${VERSION}
+
+COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/
+COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
+
+RUN set -x \
+    && apt-get update \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/ \
+    && pip3 install --break-system-packages --no-cache-dir --user -r /opt/telink/zephyrproject/zephyr/scripts/requirements.txt \
+    && : # last line
+
+ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
+ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
@@ -0,0 +1 @@
+../../../build.sh
@@ -0,0 +1 @@
+../../../run.sh
@@ -0,0 +1 @@
+../../base/chip-build/version
@@ -17,19 +17,19 @@ RUN set -x \
     && zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
     && : # last line
 
-# Setup Zephyr
-ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
+# Setup Zephyr version: 3.7.0; branch: develop
+ARG ZEPHYR_REVISION=46b82695b9390d74bcfa4b01a14a009c01b96895
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install --break-system-packages -U --no-cache-dir west \
-    && git clone https://github.com/telink-semi/zephyr \
+    && git init zephyr \
     && cd zephyr \
+    && git remote add origin https://github.com/telink-semi/zephyr \
+    && git fetch --depth=1 origin ${ZEPHYR_REVISION} \
     && git reset ${ZEPHYR_REVISION} --hard \
     && west init -l \
-    && cd .. \
     && west update -o=--depth=1 -n -f smart \
     && west blobs fetch hal_telink \
-    && west zephyr-export \
     && : # last line
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}

diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -5,6 +5,7 @@ FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32
 FROM ghcr.io/project-chip/chip-build-android:${VERSION} AS android
 FROM ghcr.io/project-chip/chip-build-esp32-qemu:${VERSION} as esp32
 FROM ghcr.io/project-chip/chip-build-telink:${VERSION} AS telink
+FROM ghcr.io/project-chip/chip-build-telink-zephyr_3_3:${VERSION} AS telink-zephyr_3_3
 FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS psoc6
 FROM ghcr.io/project-chip/chip-build-tizen-qemu:${VERSION} AS tizen
 FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
@@ -39,6 +40,8 @@ COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox
 
 COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
 COPY --from=telink /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0
+COPY --from=telink-zephyr_3_3 /opt/telink/zephyrproject /opt/telink/zephyrproject
+COPY --from=telink-zephyr_3_3 /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0
 
 COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		120 : [NXP] Update NXP sdk version
		121 : [Telink] Update Docker image (Zephyr 3.3 & 3.7 support)