feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(bt/controller): Fixed controller flash only bug if hci-uart is enabled

Browse Source
This commit is contained in:
zhiweijian
2025-03-24 20:33:08 +08:00
parent 4e61ce24d6
commit 15a901fb5e
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/esp32c3/Kconfig.in
View File

@ -548,7 +548,7 @@ config BT_CTRL_BLE_SCAN
default y default y
config BT_CTRL_BLE_SECURITY_ENABLE config BT_CTRL_BLE_SECURITY_ENABLE
depends on BT_CTRL_RUN_IN_FLASH_ONLY && BT_CONTROLLER_ONLY depends on BT_CTRL_RUN_IN_FLASH_ONLY
bool "Enable BLE security feature" bool "Enable BLE security feature"
default y default y

20
components/esp_rom/CMakeLists.txt
View File

@ -189,17 +189,19 @@ else() # Regular app build
endif() endif()
elseif(target STREQUAL "esp32c3") elseif(target STREQUAL "esp32c3")
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) if(NOT CONFIG_BT_CTRL_BLE_MASTER)
rom_linker_script("ble_master") rom_linker_script("ble_master")
endif() endif()
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) if(NOT CONFIG_BT_CONTROLLER_ONLY)
rom_linker_script("ble_50") if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
rom_linker_script("ble_50")
endif()
endif() endif()
if(CONFIG_BT_BLE_CCA_MODE_NONE) if(CONFIG_BT_BLE_CCA_MODE_NONE)
rom_linker_script("ble_cca") rom_linker_script("ble_cca")
endif() 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") rom_linker_script("ble_smp")
endif() endif()
if(NOT CONFIG_BT_CTRL_DTM_ENABLE) if(NOT CONFIG_BT_CTRL_DTM_ENABLE)
@ -227,17 +229,19 @@ else() # Regular app build
endif() endif()
endif() endif()
elseif(target STREQUAL "esp32s3") elseif(target STREQUAL "esp32s3")
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) if(NOT CONFIG_BT_CTRL_BLE_MASTER)
rom_linker_script("ble_master") rom_linker_script("ble_master")
endif() endif()
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED) if(NOT CONFIG_BT_CONTROLLER_ONLY)
rom_linker_script("ble_50") if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
rom_linker_script("ble_50")
endif()
endif() endif()
if(CONFIG_BT_BLE_CCA_MODE_NONE) if(CONFIG_BT_BLE_CCA_MODE_NONE)
rom_linker_script("ble_cca") rom_linker_script("ble_cca")
endif() 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") rom_linker_script("ble_smp")
endif() endif()
if(NOT CONFIG_BT_CTRL_DTM_ENABLE) if(NOT CONFIG_BT_CTRL_DTM_ENABLE)