Enable BT per chip

me-no-dev · me-no-dev · commit aaf47abea867 · 2024-03-06T23:53:56.000+02:00
Somehow CONFIG_BT_ENABLED can be on on non-BT chips, which can cause issues when including headers based on that switch.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+CONFIG_BT_ENABLED=y`
`1`	`2`	`CONFIG_BT_BLE_BLUFI_ENABLE=y`
`2`	`3`	`CONFIG_RTC_CLK_CAL_CYCLES=576`
`3`	`4`	`# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+CONFIG_BT_ENABLED=y`
`1`	`2`	`CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y`
`2`	`3`	`CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y`
`3`	`4`	`CONFIG_SPIRAM=y`