From 583a8c441dbd9e0f6752fb13cb1f8ac61728d544 Mon Sep 17 00:00:00 2001 From: ShenWeilong Date: Fri, 3 Apr 2026 21:31:19 +0800 Subject: [PATCH] fix(ble): fixed esp32h4 kconfig CI warning --- components/bt/CMakeLists.txt | 4 +- .../bt/porting_btdm/controller/ble/Kconfig.in | 124 ------------------ .../controller/ble/src}/ble.c | 0 3 files changed, 3 insertions(+), 125 deletions(-) rename components/bt/{controller/esp32h4 => porting_btdm/controller/ble/src}/ble.c (100%) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 86eb90c673..5eb1855e06 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -93,7 +93,9 @@ if(CONFIG_BT_ENABLED) list(APPEND srcs "controller/esp32c2/dummy.c") set(ldscripts "linker_esp32c2.lf") else() - list(APPEND srcs "controller/${target_name}/ble.c") + if(NOT CONFIG_BT_DUAL_MODE_ARCH) + list(APPEND srcs "controller/${target_name}/ble.c") + endif() list(APPEND ldscripts "linker_esp_ble_controller.lf") endif() diff --git a/components/bt/porting_btdm/controller/ble/Kconfig.in b/components/bt/porting_btdm/controller/ble/Kconfig.in index 5fb4d0f6ea..efb9496c3e 100644 --- a/components/bt/porting_btdm/controller/ble/Kconfig.in +++ b/components/bt/porting_btdm/controller/ble/Kconfig.in @@ -300,130 +300,6 @@ menu "Memory Settings" endmenu menu "Controller debug features" - menuconfig BT_LE_CONTROLLER_LOG_ENABLED - bool "Controller log enable" - default n - help - Enable controller log - - config BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 - bool "Utilize BLE Log v2 for controller log" - depends on BLE_LOG_ENABLED - default y - help - Utilize BLE Log v2 for controller log - - if !BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 - config BT_LE_CONTROLLER_LOG_CTRL_ENABLED - bool "enable controller log module" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default y - help - Enable controller log module - - config BT_LE_CONTROLLER_LOG_HCI_ENABLED - bool "enable HCI log module" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default y - help - Enable hci log module - - config BT_LE_CONTROLLER_LOG_DUMP_ONLY - bool "Controller log dump mode only" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default y - help - Only operate in dump mode - - config BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED - bool "Output ble controller logs to SPI bus (Experimental)" - depends on BT_LE_CONTROLLER_LOG_ENABLED - depends on !BT_LE_CONTROLLER_LOG_DUMP_ONLY - select BT_BLE_LOG_SPI_OUT_ENABLED - default n - help - Output ble controller logs to SPI bus - - config BT_LE_CONTROLLER_LOG_UHCI_OUT_ENABLED - bool "Output ble controller logs via UART DMA (Experimental)" - depends on BT_LE_CONTROLLER_LOG_ENABLED - depends on !BT_LE_CONTROLLER_LOG_DUMP_ONLY - depends on !BT_LE_CONTROLLER_LOG_SPI_OUT_ENABLED - select BT_BLE_LOG_UHCI_OUT_ENABLED - default y - help - Output ble controller logs via UART DMA - - config BT_LE_CONTROLLER_LOG_STORAGE_ENABLE - bool "Store ble controller logs to flash(Experimental)" - depends on !BT_LE_CONTROLLER_LOG_DUMP_ONLY - depends on BT_LE_CONTROLLER_LOG_ENABLED - default n - help - Store ble controller logs to flash memory. - - config BT_LE_CONTROLLER_LOG_PARTITION_SIZE - int "size of ble controller log partition(Multiples of 4K)" - depends on BT_LE_CONTROLLER_LOG_STORAGE_ENABLE - default 65536 - help - The size of ble controller log partition shall be a multiples of 4K. - The name of log partition shall be "bt_ctrl_log". - The partition type shall be ESP_PARTITION_TYPE_DATA. - The partition sub_type shall be ESP_PARTITION_SUBTYPE_ANY. - - config BT_LE_LOG_CTRL_BUF1_SIZE - int "size of the first BLE controller LOG buffer" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default 4096 - help - Configure the size of the first BLE controller LOG buffer. - - config BT_LE_LOG_CTRL_BUF2_SIZE - int "size of the second BLE controller LOG buffer" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default 1024 - help - Configure the size of the second BLE controller LOG buffer. - - config BT_LE_LOG_HCI_BUF_SIZE - int "size of the BLE HCI LOG buffer" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default 4096 - help - Configure the size of the BLE HCI LOG buffer. - endif - - config BT_LE_CONTROLLER_LOG_WRAP_PANIC_HANDLER_ENABLE - bool "Enable wrap panic handler" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default n - help - Wrap esp_panic_handler to get controller logs when PC pointer exception crashes. - - config BT_LE_CONTROLLER_LOG_TASK_WDT_USER_HANDLER_ENABLE - bool "Enable esp_task_wdt_isr_user_handler implementation" - depends on BT_LE_CONTROLLER_LOG_ENABLED - default n - help - Implement esp_task_wdt_isr_user_handler to get controller logs when task wdt issue is triggered. - - config BT_LE_CONTROLLER_LOG_OUTPUT_LEVEL - int "The output level of controller log" - depends on BT_LE_CONTROLLER_LOG_ENABLED - range 0 5 - default 1 - help - The output level of controller log. - - config BT_LE_CONTROLLER_LOG_MOD_OUTPUT_SWITCH - hex "The switch of module log output" - depends on BT_LE_CONTROLLER_LOG_ENABLED - range 0 0xFFFFFFFF - default 0xFFFFFFFF - help - The switch of module log output, this is an unsigned 32-bit hexadecimal value. - config BT_LE_ERROR_SIM_ENABLED bool "Enable controller features for internal testing" default n diff --git a/components/bt/controller/esp32h4/ble.c b/components/bt/porting_btdm/controller/ble/src/ble.c similarity index 100% rename from components/bt/controller/esp32h4/ble.c rename to components/bt/porting_btdm/controller/ble/src/ble.c