Merge branch 'update_zephyr_3.7' into review_and_adopt_wifi_driver

s07641069 · Jan 27, 2025 · 45f96e2 · 45f96e2
2 parents d40b6bb + 28b9886
commit 45f96e2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -178,14 +178,14 @@ jobs:
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
-            - name: Build example Telink (TL3218) Lighting App with OTA (LZMA), Factory Data
+            - name: Build example Telink (TL3218) Lighting App with OTA, Factory Data
               # Run test for master and all PRs
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tl3218-light-ota-compress-lzma-factory-data' build"
+                    "./scripts/build/build_examples.py --target 'telink-tl3218-light-ota-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tl3218 light-app-ota-compress-lzma-factory-data \
-                    out/telink-tl3218-light-ota-compress-lzma-factory-data/zephyr/zephyr.elf \
+                    telink tl3218 light-app-ota-factory-data \
+                    out/telink-tl3218-light-ota-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output (keep tools)
@@ -200,10 +200,11 @@ jobs:
                     telink tl7218 light-app-ota-shell-factory-data \
                     out/telink-tl7218-light-ota-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
+
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
-              - name: Build example Telink (TL7218 retention) Light Switch App with OTA (LZMA), Factory Data
+            - name: Build example Telink (TL7218 retention) Light Switch App with OTA (LZMA), Factory Data
               # Run test for master and s07641069 PRs
               if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
               run: |
@@ -214,6 +215,9 @@ jobs:
                     out/telink-tl7218_retention-light-switch-ota-compress-lzma-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
+            - name: clean out build output (keep tools)
+              run: rm -rf ./out/telink*
+
             - name: Build example Telink (B92) Light Switch App with OTA (LZMA), Shell, Factory Data, 4Mb flash
               # Run test for master and all PRs
               run: |
@@ -241,19 +245,19 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B95) OTA Requestor App
-              # Run test for master and s07641069 PRs
-              if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9258a-ota-requestor' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9258a ota-requestor-app \
-                    out/telink-tlsr9258a-ota-requestor/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
-            - name: clean out build output
-              run: rm -rf ./out
+            # - name: Build example Telink (B95) OTA Requestor App
+            #   # Run test for master and s07641069 PRs
+            #   if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
+            #   run: |
+            #       ./scripts/run_in_build_env.sh \
+            #         "./scripts/build/build_examples.py --target 'telink-tlsr9258a-ota-requestor' build"
+            #       .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+            #         telink tlsr9258a ota-requestor-app \
+            #         out/telink-tlsr9258a-ota-requestor/zephyr/zephyr.elf \
+            #         /tmp/bloat_reports/
+
+            # - name: clean out build output
+            #   run: rm -rf ./out
 
             - name: Build example Telink (B91 USB) Pump App
               # Run test for master and s07641069 PRs

diff --git a/config/telink/app/bootloader.conf b/config/telink/app/bootloader.conf
@@ -37,6 +37,4 @@ CONFIG_BOOT_VALIDATE_SLOT0=y
 #  - DEBUG, LOG_LEVEL_DBG
 CONFIG_MCUBOOT_LOG_LEVEL_INF=y
 
-# Reduced footprint
-CONFIG_GPIO=n
 CONFIG_PICOLIBC=y
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -212,7 +212,7 @@ config SOC_SERIES_RISCV_TELINK_TLX_NON_RETENTION_RAM_CODE
     default n if PM
 
 config TELINK_TLX_MATTER_RETENTION_LAYOUT
-    default y if PM || BOARD_TL3218X
+    default y if PM || BOARD_TL3218
 
 config PWM
     default n if PM