diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults index 85a80b22b2084f..a708636fa97683 100644 --- 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 index 9ffe341d97cec9..8460cfb42d9b8b 100644 --- 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 index 9f1388d122baec..07967f8b273e4f 100644 --- 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 deleted file mode 100644 index c57cc0eb0341e2..00000000000000 --- a/src/platform/telink/tlsr9528a_retention.overlay +++ /dev/null @@ -1,116 +0,0 @@ -/ { - aliases { - system-state-led = &led_red; - pwm-led0 = &pwm_led0; - pwm-led1 = &pwm_led1; - pwm-led2 = &pwm_led2; - pwm-led3 = &pwm_led3; - }; - - pwm_leds { - /delete-node/ pwm_led_0; - pwm_led0: pwm_led_0 { - pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "PWM LED Blue"; - }; - pwm_led1: pwm_led_1 { - pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "PWM LED Green"; - }; - pwm_led2: pwm_led_2 { - pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "PWM LED Red"; - }; - pwm_led3: pwm_led_3 { - pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "PWM IDENTIFY LED Green"; - }; - }; - - keys { - /delete-node/ button_1; - /delete-node/ button_3; - compatible = "gpio-keys"; - key_1: button_1 { - gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - }; - key_2: button_2 { - gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - }; - key_3: button_3 { - gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - }; - key_4: button_4 { - gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - }; - - key_matrix_col1: key_matrix_col1 { - gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>; - }; - key_matrix_col2: key_matrix_col2 { - gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>; - }; - key_matrix_row1: key_matrix_row1 { - gpios = <&gpiod 2 GPIO_PULL_DOWN>; - }; - key_matrix_row2: key_matrix_row2 { - gpios = <&gpiod 7 GPIO_PULL_DOWN>; - }; - }; -}; - -&pinctrl { - pwm_ch0_pd0_default: pwm_ch0_pd0_default { - pinmux = ; - }; - pwm_ch1_pd1_default: pwm_ch1_pd1_default { - pinmux = ; - }; - pwm_ch2_pe2_default: pwm_ch2_pe2_default { - pinmux = ; - }; - pwm_ch3_pe0_default: pwm_ch3_pe0_default { - pinmux = ; - }; -}; - -&pwm0 { - pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>; -}; - -&flash { - reg = <0x20000000 0x200000>; - - partitions { - /delete-node/ partition@0; - /delete-node/ partition@20000; - /delete-node/ partition@88000; - /delete-node/ partition@f0000; - /delete-node/ partition@f4000; - /delete-node/ partition@fe000; - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x19000>; - }; - slot0_partition: partition@19000 { - label = "image-0"; - reg = <0x19000 0xee000>; - }; - factory_partition: partition@107000 { - label = "factory-data"; - reg = <0x107000 0x1000>; - }; - storage_partition: partition@108000 { - label = "storage"; - reg = <0x108000 0x8000>; - }; - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x110000 0xee000>; - }; - vendor_partition: partition@1fe000 { - label = "vendor-data"; - reg = <0x1fe000 0x2000>; - }; - }; -}; diff --git a/src/platform/telink/tlsr9528a_retention.overlay b/src/platform/telink/tlsr9528a_retention.overlay new file mode 120000 index 00000000000000..cdead16cfc4022 --- /dev/null +++ b/src/platform/telink/tlsr9528a_retention.overlay @@ -0,0 +1 @@ +tlsr9528a.overlay \ No newline at end of file