[Telink] Fix after rebase

s07641069 · Oct 17, 2023 · 251c8ca · 251c8ca
1 parent a310e8e
commit 251c8ca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 124 deletions.
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -75,9 +75,6 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
 config HEAP_MEM_POOL_SIZE
     default 256
 
-config COMMON_LIBC_MALLOC_ARENA_SIZE
-    default 12288
-
 config COMMON_LIBC_MALLOC_ARENA_SIZE 
     default 12288
 
@@ -157,7 +154,7 @@ choice B9X_BLE_CTRL_MAC_TYPE
     default B9X_BLE_CTRL_MAC_TYPE_RANDOM_STATIC
 endchoice
 
-#Board retention config
+# Board retention config
 if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
 config BOARD_TLSR9X_NON_RETENTION_RAM_CODE
     default y if PM

diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -54,7 +54,7 @@ const struct gpio_dt_spec sBleStartButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_
 #if APP_USE_THREAD_START_BUTTON
 const struct gpio_dt_spec sThreadStartButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_3), gpios);
 #endif
-#if APP_USE_EXAMPLE_START_BUTTON 
+#if APP_USE_EXAMPLE_START_BUTTON
 const struct gpio_dt_spec sExampleActionButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_4), gpios);
 #endif
 #else

diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h
@@ -101,10 +101,10 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #endif
 
-#ifndef CONFIG_BT
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
-#else
+#ifdef CONFIG_BT
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 #endif
 
 // ========== Platform-specific Configuration =========

diff --git a/src/platform/telink/tlsr9528a_retention.overlay b/src/platform/telink/tlsr9528a_retention.overlay
diff --git a/src/platform/telink/tlsr9528a_retention.overlay b/src/platform/telink/tlsr9528a_retention.overlay
@@ -0,0 +1 @@
+tlsr9528a.overlay