Merge 8d494f6 into b082219

project-chip · Jan 28, 2025 · 1189363 · 1189363
2 parents b082219 + 8d494f6
commit 1189363
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 10 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -109,9 +109,9 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: telink
-            # - name: Update Zephyr to specific revision (for developers purpose)
-            #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py c05c461b1119782cc839cf436fa04ec5e1fb2c8c"
+            - name: Update Zephyr to specific revision (for developers purpose)
+              shell: bash
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3186756b6338a3b1cad5b86037f3c5331ba8b4a8"
             - name: CI Examples Telink
               shell: bash
               run: |

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -57,8 +57,8 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
-            # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py c05c461b1119782cc839cf436fa04ec5e1fb2c8c"
+            - name: Update Zephyr to specific revision (for developers purpose)
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3186756b6338a3b1cad5b86037f3c5331ba8b4a8"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               # Run test for master and s07641069 PRs
@@ -167,14 +167,14 @@ jobs:
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
-            - name: Build example Telink (tl321x) Lighting App with OTA (LZMA), Shell, Factory Data
+            - name: Build example Telink (tl321x) Lighting App with OTA, Shell, Factory Data
               # Run test for master and all PRs
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tl3218x-light-ota-compress-lzma-shell-factory-data' build"
+                    "./scripts/build/build_examples.py --target 'telink-tl3218x-light-ota-shell-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tl3218x light-app-ota-compress-lzma-shell-factory-data \
-                    out/telink-tl3218x-light-ota-compress-lzma-shell-factory-data/zephyr/zephyr.elf \
+                    telink tl3218x light-app-ota-shell-factory-data \
+                    out/telink-tl3218x-light-ota-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output (keep tools)
@@ -193,6 +193,19 @@ jobs:
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
+            - name: Build example Telink (tl721x retention) Light Switch App with OTA (LZMA), Factory Data
+              # Run test for master and all PRs
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py --target 'telink-tl7218x_retention-light-switch-ota-compress-lzma-factory-data' build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    telink tl7218x_retention light-switch-app-ota-compress-lzma-factory-data \
+                    out/telink-tl7218x_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
               # Run test for master and all PRs
               run: |

diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -218,6 +218,18 @@ config PWM
 
 endif
 
+if BOARD_TL7218X_RETENTION || BOARD_TL3218X_RETENTION || BOARD_TL3218X
+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
+
+config PWM
+    default n if PM
+
+endif
+
 # Board non-retention config
 if  BOARD_TLSR9118BDK40D || BOARD_TLSR9118BDK40D_V1 || \
     BOARD_TLSR9528A || BOARD_TLSR9258A || BOARD_TLSR9518ADK80D || BOARD_TL3218X || BOARD_TL7218X

diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
@@ -782,6 +782,7 @@ def BuildTelinkTarget():
         TargetPart('tlsr9258a_retention', board=TelinkBoard.TLSR9258A_RETENTION),
         TargetPart('tl3218x', board=TelinkBoard.TL3218X),
         TargetPart('tl7218x', board=TelinkBoard.TL7218X),
+        TargetPart('tl7218x_retention', board=TelinkBoard.TL7218X_RETENTION),
     ])
 
     target.AppendFixedTargets([

diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
@@ -123,6 +123,7 @@ class TelinkBoard(Enum):
     TLSR9258A_RETENTION = auto()
     TL3218X = auto()
     TL7218X = auto()
+    TL7218X_RETENTION = auto()
 
     def GnArgName(self):
         if self == TelinkBoard.TLRS9118BDK40D:
@@ -141,6 +142,8 @@ def GnArgName(self):
             return 'tl3218x'
         elif self == TelinkBoard.TL7218X:
             return 'tl7218x'
+        elif self == TelinkBoard.TL7218X_RETENTION:
+            return 'tl7218x_retention'
         else:
             raise Exception('Unknown board type: %r' % self)
 

diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -22,5 +22,5 @@ nuttx-x64-light
 qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage]
 stm32-stm32wb5mm-dk-light
 tizen-arm-{all-clusters,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-coverage][-with-ui]
-telink-{tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tlsr9258a,tlsr9258a_retention,tl3218x,tl7218x}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars][-usb][-compress-lzma][-thread-analyzer]
+telink-{tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tlsr9258a,tlsr9258a_retention,tl3218x,tl7218x,tl7218x_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars][-usb][-compress-lzma][-thread-analyzer]
 openiotsdk-{shell,lock}[-mbedtls][-psa]