From b2fba50e784291448428f55f42589ef528c07c7b Mon Sep 17 00:00:00 2001 From: weitianhua Date: Thu, 28 Oct 2021 19:25:44 +0800 Subject: [PATCH] Remove dummy defines of Classic BT --- components/soc/esp32/include/soc/soc_caps.h | 4 +--- components/soc/esp32c3/include/soc/soc_caps.h | 3 --- components/soc/esp32s3/include/soc/soc_caps.h | 18 ------------------ 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index f315c7b71c..59d06ed2dd 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -63,6 +63,7 @@ #define SOC_MCPWM_SUPPORTED 1 #define SOC_SDMMC_HOST_SUPPORTED 1 #define SOC_BT_SUPPORTED 1 +#define SOC_CLASSIC_BT_SUPPORTED 1 #define SOC_PCNT_SUPPORTED 1 #define SOC_SDIO_SLAVE_SUPPORTED 1 #define SOC_TWAI_SUPPORTED 1 @@ -278,6 +279,3 @@ /*------------------------------ BLE --------------------------------------------*/ #define SOC_BLE_DONT_UPDATE_OWN_RPA (1) - -/*------------------------------ Classic BT --------------------------------------------*/ -#define SOC_CLASSIC_BT_SUPPORTED (1) /* ESP32 Support Classic BT */ diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index 745eeef70f..e61cf8493d 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -268,6 +268,3 @@ #define SOC_PM_SUPPORT_WIFI_PD (1) #define SOC_PM_SUPPORT_BT_PD (1) - -/*------------------------------ Classic BT --------------------------------------------*/ -#define SOC_CLASSIC_BT_SUPPORTED (0) /* ESP32-C3 doesn't support Classic BT */ diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 40923fa459..38c53510ee 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -13,31 +13,13 @@ #define SOC_CPU_CORES_NUM 2 #define SOC_CACHE_SUPPORT_WRAP 1 #define SOC_ULP_SUPPORTED 1 -<<<<<<< HEAD -======= #define SOC_BT_SUPPORTED 1 -#define SOC_USB_OTG_SUPPORTED 1 -#define SOC_USB_SERIAL_JTAG_SUPPORTED 1 ->>>>>>> f4aad85f8b... Make Classic BT related document links only visible for ESP32 #define SOC_RTC_SLOW_MEM_SUPPORTED 1 #define SOC_CCOMP_TIMER_SUPPORTED 1 #define SOC_DIG_SIGN_SUPPORTED 1 #define SOC_HMAC_SUPPORTED 1 #define SOC_ASYNC_MEMCPY_SUPPORTED 1 #define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 3 -<<<<<<< HEAD - -======= -#define SOC_EFUSE_REVOKE_BOOT_KEY_DIGESTS 1 -#define SOC_SDMMC_HOST_SUPPORTED 1 -#define SOC_FLASH_ENCRYPTION_XTS_AES 1 -#define SOC_FLASH_ENCRYPTION_XTS_AES_256 1 -#define SOC_PSRAM_DMA_CAPABLE 1 -#define SOC_XT_WDT_SUPPORTED 1 - -/*-------------------------- SOC CAPS ----------------------------------------*/ -#define SOC_APPCPU_HAS_CLOCK_GATING_BUG (1) ->>>>>>> f4aad85f8b... Make Classic BT related document links only visible for ESP32 /*-------------------------- ADC CAPS ----------------------------------------*/ #include "adc_caps.h"