diff --git a/components/bt/controller/esp32c3/Kconfig.in b/components/bt/controller/esp32c3/Kconfig.in index 0f5f29ec8f..17f02e6be5 100644 --- a/components/bt/controller/esp32c3/Kconfig.in +++ b/components/bt/controller/esp32c3/Kconfig.in @@ -547,6 +547,11 @@ config BT_CTRL_BLE_SCAN bool "Enable BLE scan feature" default y +config BT_CTRL_BLE_SECURITY_ENABLE + depends on BT_CTRL_RUN_IN_FLASH_ONLY + bool "Enable BLE security feature" + default y + config BT_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS bool "Enable enhanced Access Address check in CONNECT_IND" default n diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index d01c6f8221..97468d121e 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -205,17 +205,19 @@ else() # Regular app build rom_linker_script("newlib") rom_linker_script("version") - if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY) + if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND NOT CONFIG_BT_CTRL_HCI_MODE_UART_H4) if(NOT CONFIG_BT_CTRL_BLE_MASTER) rom_linker_script("ble_master") endif() - if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) - rom_linker_script("ble_50") + if(NOT CONFIG_BT_CONTROLLER_ONLY) + if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) + rom_linker_script("ble_50") + endif() endif() if(CONFIG_BT_BLE_CCA_MODE_NONE) rom_linker_script("ble_cca") endif() - if(NOT CONFIG_BT_NIMBLE_SECURITY_ENABLE AND NOT CONFIG_BT_BLE_SMP_ENABLE) + if(NOT CONFIG_BT_CTRL_BLE_SECURITY_ENABLE) rom_linker_script("ble_smp") endif() if(NOT CONFIG_BT_CTRL_DTM_ENABLE) @@ -245,17 +247,19 @@ else() # Regular app build rom_linker_script("newlib") rom_linker_script("version") - if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY) + if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND NOT CONFIG_BT_CTRL_HCI_MODE_UART_H4) if(NOT CONFIG_BT_CTRL_BLE_MASTER) rom_linker_script("ble_master") endif() - if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) - rom_linker_script("ble_50") + if(NOT CONFIG_BT_CONTROLLER_ONLY) + if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) + rom_linker_script("ble_50") + endif() endif() if(CONFIG_BT_BLE_CCA_MODE_NONE) rom_linker_script("ble_cca") endif() - if(NOT CONFIG_BT_NIMBLE_SECURITY_ENABLE AND NOT CONFIG_BT_BLE_SMP_ENABLE) + if(NOT CONFIG_BT_CTRL_BLE_SECURITY_ENABLE) rom_linker_script("ble_smp") endif() if(NOT CONFIG_BT_CTRL_DTM_ENABLE)