From aaf47abea86752cda706293664171d9f38b8e3ad Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Wed, 6 Mar 2024 23:53:56 +0200 Subject: [PATCH] Enable BT per chip Somehow CONFIG_BT_ENABLED can be on on non-BT chips, which can cause issues when including headers based on that switch. --- configs/defconfig.common | 1 - configs/defconfig.esp32 | 1 + configs/defconfig.esp32c2 | 1 + configs/defconfig.esp32c3 | 1 + configs/defconfig.esp32c6 | 1 + configs/defconfig.esp32h2 | 1 + configs/defconfig.esp32s3 | 1 + 7 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index 1801b0c..e3f393f 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -3,7 +3,6 @@ CONFIG_AUTOSTART_ARDUINO=y CONFIG_ARDUHAL_ESP_LOG=y CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y -CONFIG_BT_ENABLED=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BTC_TASK_STACK_SIZE=8192 diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 08f787f..eb522af 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -1,5 +1,6 @@ CONFIG_BTDM_CTRL_MODE_BTDM=y CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20 +CONFIG_BT_ENABLED=y CONFIG_BT_CLASSIC_ENABLED=y CONFIG_BT_A2DP_ENABLE=y CONFIG_BT_SPP_ENABLED=y diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2 index 5f5e025..11c0100 100644 --- a/configs/defconfig.esp32c2 +++ b/configs/defconfig.esp32c2 @@ -1,5 +1,6 @@ CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ=26 +CONFIG_BT_ENABLED=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 1aa5528..9320ceb 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -1,3 +1,4 @@ CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 +CONFIG_BT_ENABLED=y diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index ced5947..14939d8 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -1,3 +1,4 @@ +CONFIG_BT_ENABLED=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index ced5947..14939d8 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -1,3 +1,4 @@ +CONFIG_BT_ENABLED=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index df73126..6670bc2 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -1,3 +1,4 @@ +CONFIG_BT_ENABLED=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_SPIRAM=y