riscv: telink:tl3218x: clean code and fix CI.

- fix CI error. - clean code and improve settings. Signed-off-by: Haiwen Xia <haiwen.xia@telink-semi.com>
s07641069 · Sep 5, 2024 · d7163f4 · d7163f4
1 parent 5696e46
commit d7163f4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 69 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -110,7 +110,7 @@ jobs:
                 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 322432f1d903337f9e5501835d7057a7a73168f6"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 4f4eb372205a449612ff5da4106c52792f53db78"
             - name: CI Examples Telink
               shell: bash
               run: |

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -57,7 +57,7 @@ jobs:
                 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 322432f1d903337f9e5501835d7057a7a73168f6"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 4f4eb372205a449612ff5da4106c52792f53db78"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |
@@ -107,18 +107,6 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (tl321x retention) Contact Sensor App
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tl3218x_retention-contact-sensor' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tl3218x_retention contact-sensor-app \
-                    out/telink-tl3218x_retention-contact-sensor/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
-            - name: clean out build output
-              run: rm -rf ./out
-
             - name: Build tools required for Factory Data
               run: |
                   ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux

diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -61,16 +61,15 @@ config POSIX_MAX_FDS
 
 # Application stack size
 config MAIN_STACK_SIZE
-    default 3240 if PM
-    default 4096 if SOC_RISCV_TELINK_TL321X
+    default 3240 if PM || SOC_RISCV_TELINK_TL321X
     default 4096
 
 config INIT_STACKS
     default y
 
 config IDLE_STACK_SIZE
-    default 512 if PM
-    default 512 if SOC_RISCV_TELINK_TL321X
+    default 512 if PM || SOC_RISCV_TELINK_TL321X
+
 
 config ISR_STACK_SIZE
     default 502 if PM
@@ -91,13 +90,11 @@ config NET_IPV6_MLD
 
 # Network buffers
 config NET_PKT_RX_COUNT
-    default 4 if PM
-    default 4 if SOC_RISCV_TELINK_TL321X
+    default 4 if PM || SOC_RISCV_TELINK_TL321X
     default 8
 
 config NET_PKT_TX_COUNT
-    default 4 if PM
-    default 4 if SOC_RISCV_TELINK_TL321X
+    default 4 if PM || SOC_RISCV_TELINK_TL321X
     default 8
 
 config NET_BUF_RX_COUNT
@@ -161,15 +158,12 @@ config BT_GATT_CACHING
     bool
     default n
 
-config IPC_SERVICE
-    default n
 
 #endif
 
 config BT_RX_STACK_SIZE
     default 810 if BT_B9X
-    default 810 if BT_TLX
-    default 1010 if SOC_RISCV_TELINK_TL321X
+    default 1010 if BT_TLX
     default 2048 if BT_W91
 
 config BT_HCI_TX_STACK_SIZE
@@ -284,8 +278,8 @@ config NVS_LOOKUP_CACHE
     default y
 
 config NVS_LOOKUP_CACHE_SIZE
+    default 400  if SOC_RISCV_TELINK_TL321X
     default 2048 if !PM
-    default 400 if SOC_RISCV_TELINK_TL321X
 
 # Set multiplicator of Name Value Storage (NVS) as 1 to reach NVS sector size 4KB
 # nvs_sector_size = flash_page_size * mult = 4KB * 1 = 4KB
@@ -324,8 +318,7 @@ config CHIP_ENABLE_ICD_SUPPORT
 	default y if CHIP_THREAD_DEVICE_ROLE_SLEEPY_END_DEVICE
 
 config OPENTHREAD_THREAD_STACK_SIZE
-    default 2178 if PM
-    default 2178 if SOC_RISCV_TELINK_TL321X
+    default 2178 if PM || SOC_RISCV_TELINK_TL321X
 
 config OPENTHREAD_RADIO_WORKQUEUE_STACK_SIZE
     default 361 if PM
@@ -344,12 +337,10 @@ config OPENTHREAD_DEFAULT_TX_POWER
 endif # NET_L2_OPENTHREAD
 
 config NET_TX_STACK_SIZE
-    default 554 if PM
-    default 554 if SOC_RISCV_TELINK_TL321X
+    default 554 if PM || SOC_RISCV_TELINK_TL321X
 
 config NET_RX_STACK_SIZE
-    default 554 if PM
-    default 554 if SOC_RISCV_TELINK_TL321X
+    default 554 if PM || SOC_RISCV_TELINK_TL321X
 
 # Disable certain parts of Zephyr IPv6 stack
 config NET_IPV6_NBR_CACHE

diff --git a/src/platform/telink/CHIPPlatformConfig.h b/src/platform/telink/CHIPPlatformConfig.h
@@ -62,51 +62,28 @@
 #define CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS 1
 #endif // CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_SOC_RISCV_TELINK_TL321X
 
 #ifndef CHIP_CONFIG_MAX_GROUP_DATA_PEERS
-#define CHIP_CONFIG_MAX_GROUP_DATA_PEERS 7
+#define CHIP_CONFIG_MAX_GROUP_DATA_PEERS 5
 #endif // CHIP_CONFIG_MAX_GROUP_DATA_PEERS
 
 #ifndef CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC
-#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 2
+#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 4
 #endif // CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC
 
-#ifndef CHIP_IM_MAX_NUM_COMMAND_HANDLER
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
-#endif // CHIP_IM_MAX_NUM_COMMAND_HANDLER
-
-#ifndef CHIP_IM_MAX_NUM_WRITE_HANDLER
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
-#endif // CHIP_IM_MAX_NUM_WRITE_HANDLER
-
-#ifndef CHIP_IM_MAX_NUM_WRITE_CLIENT
-#define CHIP_IM_MAX_NUM_WRITE_CLIENT 1
-#endif // CHIP_IM_MAX_NUM_WRITE_CLIENT
-
-#ifndef CHIP_IM_MAX_REPORTS_IN_FLIGHT
-#define CHIP_IM_MAX_REPORTS_IN_FLIGHT 1
-#endif // CHIP_IM_MAX_REPORTS_IN_FLIGHT
-
-#ifndef CHIP_CONFIG_LAMBDA_EVENT_SIZE
-#define CHIP_CONFIG_LAMBDA_EVENT_SIZE (16)
-#endif // CHIP_CONFIG_LAMBDA_EVENT_SIZE
-
-#ifndef CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES
-#define CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES 2
-#endif // CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES
+#endif // CONFIG_SOC_RISCV_TELINK_TL321X
 
-#elif defined CONFIG_SOC_RISCV_TELINK_TL321X
+#if defined CONFIG_PM || defined CONFIG_SOC_RISCV_TELINK_TL321X
 
 #ifndef CHIP_CONFIG_MAX_GROUP_DATA_PEERS
-#define CHIP_CONFIG_MAX_GROUP_DATA_PEERS 5
+#define CHIP_CONFIG_MAX_GROUP_DATA_PEERS 7
 #endif // CHIP_CONFIG_MAX_GROUP_DATA_PEERS
 
 #ifndef CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC
-#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 4
+#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 2
 #endif // CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC
 
-
 #ifndef CHIP_IM_MAX_NUM_COMMAND_HANDLER
 #define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
 #endif // CHIP_IM_MAX_NUM_COMMAND_HANDLER
@@ -131,7 +108,7 @@
 #define CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES 2
 #endif // CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES
 
-#endif // CONFIG_PM
+#endif // CONFIG_PM || CONFIG_SOC_RISCV_TELINK_TL321X
 
 #ifndef CHIP_CONFIG_MAX_FABRICS
 #define CHIP_CONFIG_MAX_FABRICS 5

diff --git a/src/platform/telink/SystemPlatformConfig.h b/src/platform/telink/SystemPlatformConfig.h
@@ -56,14 +56,10 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
 
 // Reduce packet buffer pool size (default 15) to reduce ram consumption
-#ifdef CONFIG_PM
+#if defined CONFIG_PM || defined CONFIG_SOC_RISCV_TELINK_TL321X
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
 #else
-    #ifdef CONFIG_SOC_RISCV_TELINK_TL321X
-#define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0   
-    #else
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 8
-    #endif
 #endif
 
 // ========== Platform-specific Configuration Overrides =========
diff --git a/src/platform/telink/tl3218x_2m_flash.overlay b/src/platform/telink/tl3218x_2m_flash.overlay
@@ -20,6 +20,10 @@
 			label = "factory-data";
 			reg = <0x102000 0x800>;
 		};
+		factory_rfu_partition: partition@102800 {
+			label = "factory-data-rfu";
+			reg = <0x102800 0x800>;
+		};
 		storage_partition: partition@103000 {
 			label = "storage";
 			reg = <0x103000 0xc000>;