Merge branch 'bugfix/fix_a2dp_sink_crash_due_to_ble5.0_code' into 'master'

fix a2dp sink crash due to ble 5.0 code

Closes BT-1358, BT-1354, and BT-1356

See merge request espressif/esp-idf!12170

components/bt/host/bluedroid/api/include/api/esp_bt_defs.h

@@ -70,7 +70,7 @@ typedef uint8_t esp_link_key[ESP_BT_OCTET16_LEN];      /* Link Key */
 
 #define ESP_BLE_CONN_INT_MIN                0x0006       /*!< relate to BTM_BLE_CONN_INT_MIN in stack/btm_ble_api.h */
 #define ESP_BLE_CONN_INT_MAX                0x0C80       /*!< relate to BTM_BLE_CONN_INT_MAX in stack/btm_ble_api.h */
-#define ESP_BLE_CONN_LATENCY_MAX            500          /*!< relate to ESP_BLE_CONN_LATENCY_MAX in stack/btm_ble_api.h */
+#define ESP_BLE_CONN_LATENCY_MAX            499          /*!< relate to ESP_BLE_CONN_LATENCY_MAX in stack/btm_ble_api.h */
 #define ESP_BLE_CONN_SUP_TOUT_MIN           0x000A       /*!< relate to BTM_BLE_CONN_SUP_TOUT_MIN in stack/btm_ble_api.h */
 #define ESP_BLE_CONN_SUP_TOUT_MAX           0x0C80       /*!< relate to ESP_BLE_CONN_SUP_TOUT_MAX in stack/btm_ble_api.h */
 #define ESP_BLE_CONN_PARAM_UNDEF            0xffff       /* use this value when a specific value not to be overwritten */ /* relate to ESP_BLE_CONN_PARAM_UNDEF in stack/btm_ble_api.h */

components/bt/host/bluedroid/bta/gatt/bta_gattc_act.c

@@ -1158,16 +1158,12 @@ void bta_gattc_read_multi(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
         memset(&read_param, 0, sizeof(tGATT_READ_PARAM));
 
         if (status == BTA_GATT_OK) {
-            if(p_data->api_read_multi.num_attr < GATT_MAX_READ_MULTI_HANDLES) {
-                read_param.read_multiple.num_handles = p_data->api_read_multi.num_attr;
-                read_param.read_multiple.auth_req = p_data->api_read_multi.auth_req;
-                memcpy(&read_param.read_multiple.handles, p_data->api_read_multi.handles,
-                                            sizeof(UINT16) * p_data->api_read_multi.num_attr);
+            read_param.read_multiple.num_handles = p_data->api_read_multi.num_attr;
+            read_param.read_multiple.auth_req = p_data->api_read_multi.auth_req;
+            memcpy(&read_param.read_multiple.handles, p_data->api_read_multi.handles,
+                    sizeof(UINT16) * p_data->api_read_multi.num_attr);
 
-                status = GATTC_Read(p_clcb->bta_conn_id, GATT_READ_MULTIPLE, &read_param);
-            } else {
-                status = GATT_ILLEGAL_PARAMETER;
-            }
+            status = GATTC_Read(p_clcb->bta_conn_id, GATT_READ_MULTIPLE, &read_param);
         }
 
         /* read fail */

components/bt/host/bluedroid/hci/hci_layer.c

@@ -440,8 +440,14 @@ static bool filter_incoming_event(BT_HDR *packet)
         } else if (wait_entry->complete_callback) {
             wait_entry->complete_callback(packet, wait_entry->context);
 #if (BLE_50_FEATURE_SUPPORT == TRUE)
-            if (wait_entry->command->sem) {
-                osi_sem_give(&wait_entry->command->sem);
+            BlE_SYNC *sync_info =  btsnd_hcic_ble_get_sync_info();
+            if(!sync_info) {
+                HCI_TRACE_WARNING("%s sync_info is NULL. opcode = 0x%x", __func__, opcode);
+            } else {
+                if (sync_info->sync_sem && sync_info->opcode == opcode) {
+                    osi_sem_give(&sync_info->sync_sem);
+                    sync_info->opcode = 0;
+                }
             }
 #endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)
         } else if (wait_entry->complete_future) {

components/bt/host/bluedroid/stack/btu/btu_hcif.c

@@ -455,7 +455,6 @@ void btu_hcif_send_cmd (UNUSED_ATTR UINT8 controller_id, BT_HDR *p_buf)
        ) {
         vsc_callback = *((void **)(p_buf + 1));
     }
-    p_buf->sem = NULL;
 
     hci_layer_get_interface()->transmit_command(
         p_buf,
@@ -474,19 +473,19 @@ UINT8 btu_hcif_send_cmd_sync (UINT8 controller_id, BT_HDR *p_buf)
         HCI_TRACE_ERROR("%s p_buf is NULL", __func__);
         return HCI_ERR_ILLEGAL_PARAMETER_FMT;
     }
-    osi_sem_t *p_sem =  btsnd_hcic_ble_get_sync_sem();
-    if((*p_sem) == NULL) {
-        HCI_TRACE_ERROR("%s semaphore is NULL", __func__);
+    BlE_SYNC *sync_info =  btsnd_hcic_ble_get_sync_info();
+    if((sync_info ==  NULL) || (sync_info->sync_sem == NULL)) {
+        HCI_TRACE_ERROR("%s sync_info error", __func__);
         return HCI_ERR_ILLEGAL_PARAMETER_FMT;
     }
     uint16_t opcode;
     uint8_t *stream = p_buf->data + p_buf->offset;
     void *vsc_callback = NULL;
 
-    p_buf->sem = (*p_sem);
-
     STREAM_TO_UINT16(opcode, stream);
 
+    sync_info->opcode = opcode;
+
     // Eww...horrible hackery here
     /* If command was a VSC, then extract command_complete callback */
     if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC
@@ -504,7 +503,7 @@ UINT8 btu_hcif_send_cmd_sync (UINT8 controller_id, BT_HDR *p_buf)
         btu_hcif_command_status_evt,
         vsc_callback);
 
-    osi_sem_take(p_sem, OSI_SEM_MAX_TIMEOUT);
+    osi_sem_take(&sync_info->sync_sem, OSI_SEM_MAX_TIMEOUT);
 
 #if (defined(HCILP_INCLUDED) && HCILP_INCLUDED == TRUE)
     btu_check_bt_sleep ();

components/bt/host/bluedroid/stack/gatt/gatt_cl.c

@@ -263,7 +263,7 @@ void gatt_act_write (tGATT_CLCB *p_clcb, UINT8 sec_act)
     if ((rt != GATT_SUCCESS  && rt != GATT_CMD_STARTED && rt != GATT_CONGESTED)
             || (rt != GATT_CMD_STARTED && p_clcb->op_subtype == GATT_WRITE_NO_RSP)) {
         if (rt != GATT_SUCCESS) {
-            GATT_TRACE_ERROR("gatt_act_write() failed op_code=0x%x rt=%d", op_code, rt);
+            GATT_TRACE_DEBUG("gatt_act_write() failed op_code=0x%x rt=%d", op_code, rt);
         }
         gatt_end_operation(p_clcb, rt, NULL);
     }

components/bt/host/bluedroid/stack/hcic/hciblecmds.c

@@ -35,32 +35,33 @@
 
 #define HCI_GET_CMD_BUF(paramlen)       ((BT_HDR *)osi_malloc(HCIC_PREAMBLE_SIZE + sizeof(BT_HDR) + paramlen))
 #if (BLE_50_FEATURE_SUPPORT == TRUE)
-static uint8_t status;
-static osi_sem_t  sync_sem;
+static BlE_SYNC ble_sync_info;
 
 void btsnd_hcic_ble_sync_sem_init(void)
 {
-    osi_sem_new(&sync_sem, 1, 0);
+    ble_sync_info.opcode = 0;
+    osi_sem_new(&ble_sync_info.sync_sem, 1, 0);
 }
 
 void btsnd_hcic_ble_sync_sem_deinit(void)
 {
-    osi_sem_free(&sync_sem);
+    ble_sync_info.opcode = 0;
+    osi_sem_free(&ble_sync_info.sync_sem);
 }
 
-osi_sem_t *btsnd_hcic_ble_get_sync_sem(void)
+BlE_SYNC *btsnd_hcic_ble_get_sync_info(void)
 {
-    return &sync_sem;
+    return &ble_sync_info;
 }
 
 uint8_t btsnd_hcic_ble_get_status(void)
 {
-    return status;
+    return ble_sync_info.status;
 }
 
 void btsnd_hci_ble_set_status(UINT8 hci_status)
 {
-    status = hci_status;
+    ble_sync_info.status = hci_status;
     return;
 }
 #endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)

components/bt/host/bluedroid/stack/include/stack/bt_types.h

@@ -195,10 +195,16 @@ typedef struct {
     uint16_t          len;
     uint16_t          offset;
     uint16_t          layer_specific;
-    osi_sem_t         sem;
     uint8_t           data[];
 } BT_HDR;
 
+typedef struct {
+    uint8_t           status;
+    uint16_t          opcode;
+    osi_sem_t         sync_sem;
+} BlE_SYNC;
+
+
 #define BT_HDR_SIZE (sizeof (BT_HDR))
 
 #define BT_PSM_SDP                      0x0001

components/bt/host/bluedroid/stack/include/stack/btm_ble_api.h

@@ -129,7 +129,7 @@ typedef UINT8   tBTM_BLE_SFP;
 #define BTM_BLE_EXT_SCAN_WIN_MAX        0xFFFF
 #define BTM_BLE_CONN_INT_MIN            0x0006
 #define BTM_BLE_CONN_INT_MAX            0x0C80
-#define BTM_BLE_CONN_LATENCY_MAX        500
+#define BTM_BLE_CONN_LATENCY_MAX        499
 #define BTM_BLE_CONN_SUP_TOUT_MIN       0x000A
 #define BTM_BLE_CONN_SUP_TOUT_MAX       0x0C80
 #define BTM_BLE_CONN_PARAM_UNDEF        0xffff      /* use this value when a specific value not to be overwritten */

components/bt/host/bluedroid/stack/include/stack/hcimsgs.h

@@ -726,7 +726,7 @@ void btsnd_hcic_vendor_spec_cmd (void *buffer, UINT16 opcode,
 #define HCIC_PARAM_SIZE_READ_RF_PATH_COMPENSATION      0
 #define HCIC_PARAM_SIZE_WRITE_RF_PATH_COMPENSATION     4
 
-osi_sem_t *btsnd_hcic_ble_get_sync_sem(void);
+BlE_SYNC *btsnd_hcic_ble_get_sync_info(void);
 void btsnd_hcic_ble_sync_sem_init(void);
 void btsnd_hcic_ble_sync_sem_deinit(void);
 

components/bt/host/bluedroid/stack/l2cap/l2c_api.c

@@ -1834,7 +1834,7 @@ UINT16 L2CA_SendFixedChnlData (UINT16 fixed_cid, BD_ADDR rem_bda, BT_HDR *p_buf)
 
     // If already congested, do not accept any more packets
     if (p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL]->cong_sent) {
-        L2CAP_TRACE_ERROR ("L2CAP - CID: 0x%04x cannot send, already congested\
+        L2CAP_TRACE_DEBUG ("L2CAP - CID: 0x%04x cannot send, already congested\
             xmit_hold_q.count: %u buff_quota: %u", fixed_cid,
             fixed_queue_length(p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL]->xmit_hold_q),
             p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL]->buff_quota);

components/esp32s3/system_api_esp32s3.c

@@ -93,7 +93,7 @@ void IRAM_ATTR esp_restart_noos(void)
                       SYSTEM_BB_RST | SYSTEM_FE_RST | SYSTEM_MAC_RST |
                       SYSTEM_BT_RST | SYSTEM_BTMAC_RST | SYSTEM_SDIO_RST |
                       SYSTEM_SDIO_HOST_RST | SYSTEM_EMAC_RST | SYSTEM_MACPWR_RST |
-                      SYSTEM_RW_BTMAC_RST | SYSTEM_RW_BTLP_RST);
+                      SYSTEM_RW_BTMAC_RST | SYSTEM_RW_BTLP_RST | SYSTEM_BLE_REG_RST | SYSTEM_PWR_REG_RST | SYSTEM_BB_REG_RST);
     REG_WRITE(SYSTEM_CORE_RST_EN_REG, 0);
 
     // Reset timer/spi/uart

components/soc/esp32s3/include/soc/syscon_reg.h

@@ -214,6 +214,9 @@ extern "C" {
 #define SYSTEM_WIFI_RST_M ((SYSTEM_WIFI_RST_V) << (SYSTEM_WIFI_RST_S))
 #define SYSTEM_WIFI_RST_V 0xFFFFFFFF
 #define SYSTEM_WIFI_RST_S 0
+#define SYSTEM_BB_REG_RST (BIT(13))
+#define SYSTEM_PWR_REG_RST (BIT(12))
+#define SYSTEM_BLE_REG_RST (BIT(11))
 #define SYSTEM_RW_BTLP_RST (BIT(10))
 #define SYSTEM_RW_BTMAC_RST (BIT(9))
 #define SYSTEM_MACPWR_RST (BIT(8))

examples/bluetooth/bluedroid/ble/blufi/sdkconfig.defaults.esp32c3

@@ -395,7 +395,7 @@ CONFIG_BT_CTRL_HCI_TL=1
 CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
 # CONFIG_BT_CTRL_HW_CCA is not set
 CONFIG_BT_CTRL_HW_CCA_EFF=0
-# CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE is not set
+CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE=y
 CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y
 # CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set
 # CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set
@@ -415,7 +415,7 @@ CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0
 # CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set
 CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9=y
 CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
-# CONFIG_BT_CTRL_COEX_USE_HOOKS is not set
+CONFIG_BT_CTRL_COEX_USE_HOOKS=y
 
 #
 # MODEM SLEEP Options
@@ -447,7 +447,7 @@ CONFIG_BT_BTU_TASK_STACK_SIZE=4096
 CONFIG_BT_BLE_ENABLED=y
 CONFIG_BT_GATTS_ENABLE=y
 # CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set
-# CONFIG_BT_BLE_BLUFI_ENABLE is not set
+CONFIG_BT_BLE_BLUFI_ENABLE=y
 # CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0

examples/bluetooth/bluedroid/ble_50/ble50_security_server/sdkconfig.defaults.esp32s3

@@ -2,7 +2,20 @@
 # Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
+CONFIG_IDF_CMAKE=y
+CONFIG_IDF_TARGET_ARCH_XTENSA=y
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_IDF_TARGET_ESP32S3=y
+CONFIG_IDF_TARGET_ESP32S3_BETA_VERSION_2=y
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0004
+
 #
+# SDK tool configuration
+#
+CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-"
+# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
+# end of SDK tool configuration
+
 #
 # Build type
 #
@@ -152,6 +165,11 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 #
 # end of TinyUSB
 
+#
+# GDB Stub
+#
+# end of GDB Stub
+
 #
 # Driver configurations
 #
@@ -288,6 +306,102 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # end of PThreads
 
+#
+# ESP32S3-Specific
+#
+# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set
+CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160=y
+# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240 is not set
+CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=160
+
+#
+# Cache config
+#
+CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y
+# CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB is not set
+CONFIG_ESP32S3_INSTRUCTION_CACHE_SIZE=0x4000
+# CONFIG_ESP32S3_INSTRUCTION_CACHE_4WAYS is not set
+CONFIG_ESP32S3_INSTRUCTION_CACHE_8WAYS=y
+CONFIG_ESP32S3_ICACHE_ASSOCIATED_WAYS=8
+# CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B is not set
+CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y
+CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE=32
+# CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP is not set
+# CONFIG_ESP32S3_DATA_CACHE_16KB is not set
+CONFIG_ESP32S3_DATA_CACHE_32KB=y
+# CONFIG_ESP32S3_DATA_CACHE_64KB is not set
+CONFIG_ESP32S3_DATA_CACHE_SIZE=0x8000
+# CONFIG_ESP32S3_DATA_CACHE_4WAYS is not set
+CONFIG_ESP32S3_DATA_CACHE_8WAYS=y
+CONFIG_ESP32S3_DCACHE_ASSOCIATED_WAYS=8
+# CONFIG_ESP32S3_DATA_CACHE_LINE_16B is not set
+CONFIG_ESP32S3_DATA_CACHE_LINE_32B=y
+CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32
+# CONFIG_ESP32S3_DATA_CACHE_WRAP is not set
+# end of Cache config
+
+# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32S3_TRAX is not set
+CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0
+CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
+# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_THREE is not set
+CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=2
+CONFIG_ESP_MAC_ADDR_UNIVERSE_BT_OFFSET=1
+# CONFIG_ESP32S3_ULP_COPROC_ENABLED is not set
+CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32S3_DEBUG_OCDAWARE=y
+# CONFIG_ESP32S3_DEBUG_STUBS_ENABLE is not set
+CONFIG_ESP32S3_BROWNOUT_DET=y
+CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set
+CONFIG_ESP32S3_BROWNOUT_DET_LVL=7
+CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set
+# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
+# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set
+# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set
+# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set
+CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set
+# CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set
+# end of ESP32S3-Specific
+
+#
+# Modbus configuration
+#
+CONFIG_FMB_COMM_MODE_TCP_EN=y
+CONFIG_FMB_TCP_PORT_DEFAULT=502
+CONFIG_FMB_TCP_PORT_MAX_CONN=5
+CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
+CONFIG_FMB_COMM_MODE_RTU_EN=y
+CONFIG_FMB_COMM_MODE_ASCII_EN=y
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_QUEUE_LENGTH=20
+CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
+CONFIG_FMB_SERIAL_BUF_SIZE=256
+CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
+CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
+CONFIG_FMB_PORT_TASK_PRIO=10
+CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y
+CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233
+CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
+CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
+CONFIG_FMB_TIMER_PORT_ENABLED=y
+CONFIG_FMB_TIMER_GROUP=0
+CONFIG_FMB_TIMER_INDEX=0
+# CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
+# end of Modbus configuration
+
 #
 # Power Management
 #
@@ -325,6 +439,7 @@ CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_IRAM_OPT=y
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
 CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
 # end of Wi-Fi
 
 #
@@ -339,6 +454,7 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
 # Supplicant
 #
 CONFIG_WPA_MBEDTLS_CRYPTO=y
+# CONFIG_WPA_WAPI_PSK is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_WARS is not set
@@ -349,7 +465,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_SOC_SUPPORT_5_0=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
 CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
@@ -357,63 +474,65 @@ CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
-CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
-# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set
-# CONFIG_BTDM_CTRL_MODEM_SLEEP is not set
 CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
-CONFIG_BTDM_BLE_SCAN_DUPL=y
-CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
-# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set
-# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set
-CONFIG_BTDM_SCAN_DUPL_TYPE=0
-CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100
-# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
-CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
-CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
-CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+CONFIG_BT_CTRL_MODE_EFF=1
+CONFIG_BT_CTRL_BLE_MAX_ACT=10
+CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10
+CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0
+CONFIG_BT_CTRL_PINNED_TO_CORE=0
+CONFIG_BT_CTRL_HCI_MODE_VHCI=y
+# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set
+CONFIG_BT_CTRL_HCI_TL=1
+CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
+# CONFIG_BT_CTRL_HW_CCA is not set
+CONFIG_BT_CTRL_HW_CCA_EFF=0
+# CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE is not set
+CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y
+# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set
+# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set
+CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0
+CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y
+# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set
+CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0
+CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y
+# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set
+CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set
+CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9=y
+CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=7
+# CONFIG_BT_CTRL_COEX_USE_HOOKS is not set
+CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
+CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+CONFIG_BT_CTRL_BLE_SCAN_DUPL=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0
+CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# MODEM SLEEP Options
+#
+# CONFIG_BT_CTRL_MODEM_SLEEP is not set
+# end of MODEM SLEEP Options
+
+CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
+CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
+CONFIG_BT_CTRL_HCI_TL_EFF=1
+
+#
+# Bluetooth controller(ESP32S3 Bluetooth Low Energy)
 #
-CONFIG_BTDM_CTRL_MODE_EFF=1
-CONFIG_BTDM_CTRL_BLE_MAX_ACT=10
-CONFIG_BTDM_CTRL_BLE_MAX_ACT_EFF=10
-CONFIG_BTDM_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0
-CONFIG_BTDM_CTRL_HCI_TL=1
-CONFIG_BTDM_CTRL_ADV_DUP_FILT_MAX=30
-CONFIG_BTDM_CTRL_HW_CCA=y
-CONFIG_BTDM_CTRL_HW_CCA_EFF=1
-# CONFIG_BTDM_CTRL_COEX_PARAMETERS_ENABLE is not set
-CONFIG_BTDM_CTRL_CE_LENGTH_TYPE_ORIG=y
-# CONFIG_BTDM_CTRL_CE_LENGTH_TYPE_CE is not set
-# CONFIG_BTDM_CTRL_CE_LENGTH_TYPE_SD is not set
-CONFIG_BTDM_CTRL_CE_LENGTH_TYPE_EFF=0
-CONFIG_BTDM_CTRL_TX_ANTENNA_INDEX_0=y
-# CONFIG_BTDM_CTRL_TX_ANTENNA_INDEX_1 is not set
-CONFIG_BTDM_CTRL_TX_ANTENNA_INDEX_EFF=0
-CONFIG_BTDM_CTRL_RX_ANTENNA_INDEX_0=y
-# CONFIG_BTDM_CTRL_RX_ANTENNA_INDEX_1 is not set
-CONFIG_BTDM_CTRL_RX_ANTENNA_INDEX_EFF=0
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_N12 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_N9 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_N6 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_N3 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_N0 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_P3 is not set
-# CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_P6 is not set
-CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_P9=y
-CONFIG_BTDM_CTRL_DFT_TX_POWER_LEVEL_EFF=7
-# CONFIG_BTDM_CTRL_COEX_USE_HOOKS is not set
 
 #
 # MODEM SLEEP Options
 #
 # end of MODEM SLEEP Options
-
-CONFIG_BTDM_CTRL_SLEEP_MODE_EFF=0
-CONFIG_BTDM_CTRL_SLEEP_CLOCK_EFF=0
-CONFIG_BTDM_CTRL_HCI_TL_EFF=1
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller(ESP32S3 Bluetooth Low Energy)
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -426,7 +545,6 @@ CONFIG_BT_BTC_TASK_STACK_SIZE=3072
 CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0
 CONFIG_BT_BTU_TASK_STACK_SIZE=4096
 # CONFIG_BT_BLUEDROID_MEM_DEBUG is not set
-# CONFIG_BT_CLASSIC_ENABLED is not set
 CONFIG_BT_BLE_ENABLED=y
 CONFIG_BT_GATTS_ENABLE=y
 # CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set
@@ -620,6 +738,7 @@ CONFIG_BT_SMP_ENABLE=y
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
+# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
 CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
 # end of Bluetooth
@@ -685,7 +804,8 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-# CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION is not set
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
@@ -704,12 +824,20 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 # end of libsodium
 
+#
+# Wi-Fi Provisioning Manager
+#
+CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# end of Wi-Fi Provisioning Manager
+
 #
 # ESP-TLS
 #
 CONFIG_ESP_TLS_USING_MBEDTLS=y
 # CONFIG_ESP_TLS_SERVER is not set
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
+# CONFIG_ESP_TLS_INSECURE is not set
 # end of ESP-TLS
 
 #
@@ -830,6 +958,7 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
@@ -841,6 +970,9 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
 CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
+CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y
+# CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP is not set
+CONFIG_ESP_SYSTEM_PD_FLASH=y
 # end of ESP System Settings
 
 #
@@ -865,6 +997,7 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
 CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
@@ -876,7 +1009,6 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 # CONFIG_ESP_PANIC_HANDLER_IRAM is not set
 CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
 CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y
-CONFIG_ESP_MAC_ADDR_UNIVERSE_BT_OFFSET=1
 # end of Common ESP-related
 
 #
@@ -902,54 +1034,6 @@ CONFIG_ESP_EVENT_POST_FROM_ISR=y
 CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 # end of Event Loop Library
 
-#
-# ESP32C3-Specific
-#
-# CONFIG_ESP32C3_DEFAULT_CPU_FREQ_80 is not set
-CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y
-CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ=160
-
-#
-# Memory protection
-#
-# CONFIG_ESP32C3_MEMPROT_FEATURE is not set
-# end of Memory protection
-
-#
-# Cache config
-#
-# CONFIG_ESP32C3_INSTRUCTION_CACHE_WRAP is not set
-# CONFIG_ESP32C3_DATA_CACHE_WRAP is not set
-# end of Cache config
-
-# CONFIG_ESP32C3_TRAX is not set
-CONFIG_ESP32C3_TRACEMEM_RESERVE_DRAM=0x0
-CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO=y
-# CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES_THREE is not set
-CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES=2
-CONFIG_ESP32C3_DEBUG_OCDAWARE=y
-# CONFIG_ESP32C3_DEBUG_STUBS_ENABLE is not set
-CONFIG_ESP32C3_BROWNOUT_DET=y
-CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7=y
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_6 is not set
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_5 is not set
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4 is not set
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_3 is not set
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_2 is not set
-# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_1 is not set
-CONFIG_ESP32C3_BROWNOUT_DET_LVL=7
-CONFIG_ESP32C3_TIME_SYSCALL_USE_RTC_FRC1=y
-# CONFIG_ESP32C3_TIME_SYSCALL_USE_RTC is not set
-# CONFIG_ESP32C3_TIME_SYSCALL_USE_FRC1 is not set
-# CONFIG_ESP32C3_TIME_SYSCALL_USE_NONE is not set
-CONFIG_ESP32C3_RTC_CLK_SRC_INT_RC=y
-# CONFIG_ESP32C3_RTC_CLK_SRC_EXT_CRYS is not set
-# CONFIG_ESP32C3_RTC_CLK_SRC_EXT_OSC is not set
-# CONFIG_ESP32C3_RTC_CLK_SRC_INT_8MD256 is not set
-CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=1024
-CONFIG_ESP32C3_ALLOW_RTC_FAST_MEM_AS_HEAP=y
-# end of ESP32C3-Specific
-
 #
 # ESP-ASIO
 #
@@ -983,6 +1067,7 @@ CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y
 # end of Auto-detect flash chips
 # end of SPI Flash driver
 
@@ -1126,6 +1211,14 @@ CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
 # end of UDP
 
+#
+# Checksums
+#
+# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set
+# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set
+CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y
+# end of Checksums
+
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
@@ -1181,8 +1274,11 @@ CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
 # CONFIG_LWIP_SOCKETS_DEBUG is not set
 # CONFIG_LWIP_IP_DEBUG is not set
 # CONFIG_LWIP_ICMP_DEBUG is not set
+# CONFIG_LWIP_DHCP_STATE_DEBUG is not set
+# CONFIG_LWIP_DHCP_DEBUG is not set
 # CONFIG_LWIP_IP6_DEBUG is not set
 # CONFIG_LWIP_ICMP6_DEBUG is not set
+# CONFIG_LWIP_TCP_DEBUG is not set
 # end of Debug
 # end of LWIP
 
@@ -1193,6 +1289,9 @@ CONFIG_MQTT_PROTOCOL_311=y
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+# CONFIG_MQTT_MSG_ID_INCREMENTAL is not set
+# CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set
+# CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set
 # CONFIG_MQTT_USE_CUSTOM_CONFIG is not set
 # CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set
 # CONFIG_MQTT_CUSTOM_OUTBOX is not set
@@ -1234,7 +1333,7 @@ CONFIG_WS_BUFFER_SIZE=1024
 # end of Compatibility options
 
 # Deprecated options for backward compatibility
-CONFIG_TOOLPREFIX="riscv32-esp-elf-"
+CONFIG_TOOLPREFIX="xtensa-esp32s3-elf-"
 # CONFIG_FLASHMODE_QIO is not set
 # CONFIG_FLASHMODE_QOUT is not set
 CONFIG_FLASHMODE_DIO=y
@@ -1285,45 +1384,32 @@ CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_ESP32_PTHREAD_STACK_MIN=768
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
+CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_MB_QUEUE_LENGTH=20
+CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096
+CONFIG_MB_SERIAL_BUF_SIZE=256
+CONFIG_MB_SERIAL_TASK_PRIO=10
+CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=y
+CONFIG_MB_CONTROLLER_SLAVE_ID=0x00112233
+CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_MB_CONTROLLER_STACK_SIZE=4096
+CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
+CONFIG_MB_TIMER_PORT_ENABLED=y
+CONFIG_MB_TIMER_GROUP=0
+CONFIG_MB_TIMER_INDEX=0
 CONFIG_SW_COEXIST_ENABLE=y
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
-CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
-# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set
-# CONFIG_BTDM_CONTROLLER_MODEM_SLEEP is not set
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y
-# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA is not set
-# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR is not set
-CONFIG_SCAN_DUPLICATE_TYPE=0
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=100
-# CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
-CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
-CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
-# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
-CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y
-# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA is not set
-# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR is not set
-CONFIG_SCAN_DUPLICATE_TYPE=0
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=100
-# CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set
-# CONFIG_BTDM_CONTROLLER_MODEM_SLEEP is not set
 CONFIG_BLUEDROID_ENABLED=y
 # CONFIG_NIMBLE_ENABLED is not set
 CONFIG_BTC_TASK_STACK_SIZE=3072
 CONFIG_BLUEDROID_PINNED_TO_CORE=0
 CONFIG_BTU_TASK_STACK_SIZE=4096
 # CONFIG_BLUEDROID_MEM_DEBUG is not set
-# CONFIG_CLASSIC_BT_ENABLED is not set
 CONFIG_GATTS_ENABLE=y
 # CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set
 CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
@@ -1495,7 +1581,7 @@ CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2
 # CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK is not set
 CONFIG_SMP_ENABLE=y
 CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
-# CONFIG_SUPPORT_STATIC_ALLOCATION is not set
+# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
@@ -1503,6 +1589,7 @@ CONFIG_TIMER_QUEUE_LENGTH=10
 CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP32S2_PANIC_GDBSTUB is not set
+# CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_MAIN_TASK_STACK_SIZE=3584
@@ -1522,7 +1609,6 @@ CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
-# CONFIG_SPI_FLASH_NEW_ROM_API is not set
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set