From 8bf1aa8e51b7c664b3965d6b441cf9cde8c7dd08 Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Mon, 24 Mar 2025 20:33:08 +0800 Subject: [PATCH] fix(bt/controller): Fixed controller flash only bug if hci-uart is enabled --- components/esp_rom/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 6bdef628ea..89cb228696 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -193,13 +193,15 @@ else() # Regular app build 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) @@ -233,13 +235,15 @@ else() # Regular app build 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)