Merge branch 'master' into telink_enable_lzma_compression_mcuboot_ota

project-chip · Nov 4, 2024 · adc814c · adc814c
2 parents e056078 + 50ad31c
commit adc814c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/examples/dishwasher-app/silabs/build_for_wifi_gnfile.gn b/examples/dishwasher-app/silabs/build_for_wifi_gnfile.gn
@@ -24,5 +24,6 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_enable_wifi = true
+  chip_device_platform = "SiWx917"
   import("//build_for_wifi_args.gni")
 }
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-89 : [Silabs] Leave Simplicity SDK components for SLC generation CI
+90 : [Telink] Update Docker image (Zephyr update)
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -18,7 +18,7 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr
-ARG ZEPHYR_REVISION=3ed7686a9378de6be1368c912f9a42f998bbfb18
+ARG ZEPHYR_REVISION=f762f1a1027284e63e338e6d83deeade62f355b0
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install --break-system-packages -U --no-cache-dir west \
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		89 : [Silabs] Leave Simplicity SDK components for SLC generation CI
		90 : [Telink] Update Docker image (Zephyr update)