mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-14 14:06:54 +00:00
fix(bt/controller): Fixed controller flash only bug if hci-uart is enabled
This commit is contained in:
@@ -547,6 +547,11 @@ config BT_CTRL_BLE_SCAN
|
|||||||
bool "Enable BLE scan feature"
|
bool "Enable BLE scan feature"
|
||||||
default y
|
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
|
config BT_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
|
||||||
bool "Enable enhanced Access Address check in CONNECT_IND"
|
bool "Enable enhanced Access Address check in CONNECT_IND"
|
||||||
default n
|
default n
|
||||||
|
@@ -205,17 +205,19 @@ else() # Regular app build
|
|||||||
rom_linker_script("newlib")
|
rom_linker_script("newlib")
|
||||||
rom_linker_script("version")
|
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)
|
if(NOT CONFIG_BT_CTRL_BLE_MASTER)
|
||||||
rom_linker_script("ble_master")
|
rom_linker_script("ble_master")
|
||||||
endif()
|
endif()
|
||||||
|
if(NOT CONFIG_BT_CONTROLLER_ONLY)
|
||||||
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
|
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
|
||||||
rom_linker_script("ble_50")
|
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)
|
||||||
@@ -245,17 +247,19 @@ else() # Regular app build
|
|||||||
rom_linker_script("newlib")
|
rom_linker_script("newlib")
|
||||||
rom_linker_script("version")
|
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)
|
if(NOT CONFIG_BT_CTRL_BLE_MASTER)
|
||||||
rom_linker_script("ble_master")
|
rom_linker_script("ble_master")
|
||||||
endif()
|
endif()
|
||||||
|
if(NOT CONFIG_BT_CONTROLLER_ONLY)
|
||||||
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
|
if(NOT CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT AND NOT CONFIG_BT_BLE_50_FEATURES_SUPPORTED)
|
||||||
rom_linker_script("ble_50")
|
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)
|
||||||
|
Reference in New Issue
Block a user