feat(ble): Added ble support for esp32h21

2026-05-28 16:46:31 +03:00 · 2026-05-13 20:10:00 +08:00
parent 8609249317
commit cf813a4a1e
116 changed files with 405 additions and 296 deletions
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -8,6 +8,8 @@ if(CONFIG_IDF_TARGET_ESP32S3)
    set(TARGET_SRC_NAME "esp32c3")
 elseif(CONFIG_IDF_TARGET_ESP32C61)
    set(TARGET_SRC_NAME "esp32c6")
+elseif(CONFIG_IDF_TARGET_ESP32H21)
+    set(TARGET_SRC_NAME "esp32h2")
 else()
    set(TARGET_SRC_NAME "${idf_target}")
 endif()
--- a/components/bt/controller/esp32h2/bt.c
+++ b/components/bt/controller/esp32h2/bt.c
@@ -103,7 +103,9 @@ struct ext_funcs_t {
    int (* _ecc_gen_key_pair)(uint8_t *public, uint8_t *priv);
    int (* _ecc_gen_dh_key)(const uint8_t *remote_pub_key_x, const uint8_t *remote_pub_key_y,
                            const uint8_t *local_priv_key, uint8_t *dhkey);
+#if CONFIG_IDF_TARGET_ESP32H2
    void (* _esp_reset_modem)(uint8_t mdl_opts, uint8_t start);
+#endif // CONFIG_IDF_TARGET_ESP32H2
    uint32_t magic;
 };

@@ -209,7 +211,9 @@ static int esp_intr_alloc_wrapper(int source, int flags, intr_handler_t handler,
 static int esp_intr_free_wrapper(void **ret_handle);
 static void osi_assert_wrapper(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2);
 static uint32_t osi_random_wrapper(void);
+#if CONFIG_IDF_TARGET_ESP32H2
 static void esp_reset_modem(uint8_t mdl_opts,uint8_t start);
+#endif // CONFIG_IDF_TARGET_ESP32H2
 static int esp_ecc_gen_key_pair(uint8_t *pub, uint8_t *priv);
 static int esp_ecc_gen_dh_key(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_y,
                              const uint8_t *our_priv_key, uint8_t *out_dhkey);
@@ -534,10 +538,13 @@ struct ext_funcs_t ext_funcs_ro = {
    ._os_random = osi_random_wrapper,
    ._ecc_gen_key_pair = esp_ecc_gen_key_pair,
    ._ecc_gen_dh_key = esp_ecc_gen_dh_key,
+#if CONFIG_IDF_TARGET_ESP32H2
    ._esp_reset_modem = esp_reset_modem,
+#endif // CONFIG_IDF_TARGET_ESP32H2
    .magic = EXT_FUNC_MAGIC_VALUE,
 };

+#if CONFIG_IDF_TARGET_ESP32H2
 static void IRAM_ATTR esp_reset_modem(uint8_t mdl_opts,uint8_t start)
 {
    if (mdl_opts == 0x05) {
@@ -557,6 +564,7 @@ static void IRAM_ATTR esp_reset_modem(uint8_t mdl_opts,uint8_t start)

    }
 }
+#endif // CONFIG_IDF_TARGET_ESP32H2

 static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,
                                         uint32_t param1, uint32_t param2)
@@ -570,7 +578,24 @@ static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,

 static uint32_t IRAM_ATTR osi_random_wrapper(void)
 {
+#if CONFIG_SOC_RNG_SUPPORTED
    return esp_random();
+#else
+    static bool first = true;
+
+    if (first) {
+        uint8_t mac[6];
+        uint32_t seed;
+
+        ESP_LOGW(NIMBLE_PORT_LOG_TAG, "Hardware RNG not supported; using insecure software random instead.");
+        first = false;
+        esp_read_mac((uint8_t *)mac, ESP_MAC_BT);
+        seed = (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5];
+        srand(seed);
+    }
+
+    return rand();
+#endif // CONFIG_SOC_RNG_SUPPORTED
 }

 static void coex_schm_status_bit_set_wrapper(uint32_t type, uint32_t status)
--- a/components/bt/controller/esp32h21/Kconfig.in
+++ b/components/bt/controller/esp32h21/Kconfig.in
@@ -0,0 +1 @@
+source "$IDF_PATH/components/bt/controller/esp32h2/Kconfig.in"
--- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
+++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
--- a/components/bt/porting_btdm/controller/ble/src/ble.c
+++ b/components/bt/porting_btdm/controller/ble/src/ble.c
@@ -500,9 +500,6 @@ static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn,

 static uint32_t IRAM_ATTR osi_random_wrapper(void)
 {
-    //TODO: use esp_ramdom
-    // return esp_ramdom();
-
    return btdm_osal_rand();
 }

--- a/components/bt/porting_btdm/controller/btdm_common/src/btdm_osal_freertos.c
+++ b/components/bt/porting_btdm/controller/btdm_common/src/btdm_osal_freertos.c
@@ -1209,15 +1209,16 @@ wr_btdm_osal_srand(uint32_t seed)
 int
 wr_btdm_osal_rand(void)
 {
-    // TODO: use esp_random
-    // return (int)esp_random();
-
+#if CONFIG_SOC_RNG_SUPPORTED
+    return (int)esp_random();
+#else
    static bool first = true;

    if (first) {
        uint8_t mac[6];
        uint32_t seed;

+        ESP_LOGW(TAG, "Hardware RNG not supported; using insecure software random instead.");
        first = false;
        btdm_osal_read_efuse_mac(mac);
        seed = (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5];
@@ -1225,6 +1226,7 @@ wr_btdm_osal_rand(void)
    }

    return rand();
+#endif // CONFIG_SOC_RNG_SUPPORTED
 }

 /*
--- a/components/esp_coex/Kconfig
+++ b/components/esp_coex/Kconfig
@@ -3,6 +3,7 @@ menu "Wireless Coexistence"

    config ESP_COEX_ENABLED
        bool
+        default n if IDF_TARGET_ESP32H21 #  TODO: Support coexistence for ESP32H21
        default y if (!SOC_WIRELESS_HOST_SUPPORTED)

    if(ESP_COEX_ENABLED)
--- a/components/esp_hw_support/modem/port/esp32h21/modem_clock_impl.c
+++ b/components/esp_hw_support/modem/port/esp32h21/modem_clock_impl.c
@@ -34,7 +34,7 @@ uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
        case PERIPH_PHY_MODULE:                 deps = PHY_CLOCK_DEPS;                  break;
        case PERIPH_MODEM_ADC_COMMON_FE_MODULE: deps = MODEM_ADC_COMMON_FE_CLOCK_DEPS;  break;
        case PERIPH_COEX_MODULE:                deps = COEXIST_CLOCK_DEPS;              break;
-        // case PERIPH_BT_MODULE:                  deps = BLE_CLOCK_DEPS;                  break;
+        case PERIPH_BT_MODULE:                  deps = BLE_CLOCK_DEPS;                  break;
        case PERIPH_PHY_CALIBRATION_MODULE:     deps = PHY_CALIBRATION_CLOCK_DEPS;      break;
        case PERIPH_IEEE802154_MODULE:          deps = IEEE802154_CLOCK_DEPS;           break;
        case PERIPH_MODEM_ETM_MODULE:           deps = MODEM_ETM_CLOCK_DEPS;            break;
@@ -44,23 +44,23 @@ uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
    return deps;
 }

-// static void IRAM_ATTR modem_clock_ble_mac_configure(modem_clock_context_t *ctx, bool enable)
-// {
-//     modem_syscon_ll_enable_bt_mac_clock(ctx->hal->syscon_dev, enable);
-//     modem_syscon_ll_enable_modem_sec_clock(ctx->hal->syscon_dev, enable);
-//     modem_syscon_ll_enable_ble_timer_clock(ctx->hal->syscon_dev, enable);
-// }
+static void IRAM_ATTR modem_clock_ble_mac_configure(modem_clock_context_t *ctx, bool enable)
+{
+    modem_syscon_ll_enable_bt_mac_clock(ctx->hal->syscon_dev, enable);
+    modem_syscon_ll_enable_modem_sec_clock(ctx->hal->syscon_dev, enable);
+    modem_syscon_ll_enable_ble_timer_clock(ctx->hal->syscon_dev, enable);
+}

-// #if CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING
-// static esp_err_t IRAM_ATTR modem_clock_ble_mac_check_enable(modem_clock_context_t *ctx)
-// {
-//     bool all_clock_enabled = true;
-//     all_clock_enabled &= modem_syscon_ll_bt_mac_clock_is_enabled(ctx->hal->syscon_dev);
-//     all_clock_enabled &= modem_syscon_ll_modem_sec_clock_is_enabled(ctx->hal->syscon_dev);
-//     all_clock_enabled &= modem_syscon_ll_ble_timer_clock_is_enabled(ctx->hal->syscon_dev);
-//     return all_clock_enabled ? ESP_OK : ESP_FAIL;
-// }
-// #endif
+#if CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING
+static esp_err_t IRAM_ATTR modem_clock_ble_mac_check_enable(modem_clock_context_t *ctx)
+{
+    bool all_clock_enabled = true;
+    all_clock_enabled &= modem_syscon_ll_bt_mac_clock_is_enabled(ctx->hal->syscon_dev);
+    all_clock_enabled &= modem_syscon_ll_modem_sec_clock_is_enabled(ctx->hal->syscon_dev);
+    all_clock_enabled &= modem_syscon_ll_ble_timer_clock_is_enabled(ctx->hal->syscon_dev);
+    return all_clock_enabled ? ESP_OK : ESP_FAIL;
+}
+#endif

 static void IRAM_ATTR modem_clock_ble_i154_bb_configure(modem_clock_context_t *ctx, bool enable)
 {
@@ -178,7 +178,7 @@ static void IRAM_ATTR modem_clock_configure_impl(modem_clock_context_t *ctx, int
        : (dev_id == MODEM_CLOCK_COEXIST)               ? modem_clock_coex_configure
        : (dev_id == MODEM_CLOCK_I2C_MASTER)            ? modem_clock_i2c_master_configure
        : (dev_id == MODEM_CLOCK_ETM)                   ? modem_clock_etm_configure
-        // : (dev_id == MODEM_CLOCK_BLE_MAC)               ? modem_clock_ble_mac_configure */
+        : (dev_id == MODEM_CLOCK_BLE_MAC)               ? modem_clock_ble_mac_configure
        : (dev_id == MODEM_CLOCK_BT_I154_COMMON_BB)     ? modem_clock_ble_i154_bb_configure
        : (dev_id == MODEM_CLOCK_802154_MAC)            ? modem_clock_ieee802154_mac_configure
        : (dev_id == MODEM_CLOCK_DATADUMP)              ? modem_clock_data_dump_configure
@@ -198,7 +198,7 @@ static esp_err_t IRAM_ATTR modem_clock_check_impl(modem_clock_context_t *ctx, in
        : (dev_id == MODEM_CLOCK_COEXIST)               ? modem_clock_coex_check_enable
        : (dev_id == MODEM_CLOCK_I2C_MASTER)            ? modem_clock_i2c_master_check_enable
        : (dev_id == MODEM_CLOCK_ETM)                   ? modem_clock_etm_check_enable
-        // : (dev_id == MODEM_CLOCK_BLE_MAC)               ? modem_clock_ble_mac_check_enable
+        : (dev_id == MODEM_CLOCK_BLE_MAC)               ? modem_clock_ble_mac_check_enable
        : (dev_id == MODEM_CLOCK_BT_I154_COMMON_BB)     ? modem_clock_ble_i154_bb_check_enable
        : (dev_id == MODEM_CLOCK_802154_MAC)            ? modem_clock_ieee802154_mac_check_enable
        : (dev_id == MODEM_CLOCK_DATADUMP)              ? modem_clock_data_dump_check_enable
--- a/components/esp_phy/esp32h21/include/btbb_retention_reg.h
+++ b/components/esp_phy/esp32h21/include/btbb_retention_reg.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
--- a/components/esp_phy/esp32h21/include/phy_init_deps.h
+++ b/components/esp_phy/esp32h21/include/phy_init_deps.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
--- a/components/esp_phy/src/phy_init_esp32hxx.c
+++ b/components/esp_phy/src/phy_init_esp32hxx.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
--- a/components/soc/esp32h21/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32h21/include/soc/Kconfig.soc_caps.in
@@ -31,6 +31,10 @@ config SOC_GPTIMER_SUPPORTED
    bool
    default y

+config SOC_BT_SUPPORTED
+    bool
+    default y
+
 config SOC_IEEE802154_SUPPORTED
    bool
    default y
@@ -1042,3 +1046,43 @@ config SOC_MODEM_CLOCK_IS_INDEPENDENT
 config SOC_RCC_IS_INDEPENDENT
    bool
    default y
+
+config SOC_BLE_SUPPORTED
+    bool
+    default y
+
+config SOC_ESP_NIMBLE_CONTROLLER
+    bool
+    default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_POWER_CONTROL_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_MULTI_CONN_OPTIMIZATION
+    bool
+    default y
+
+config SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_CTE_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_SUBRATE_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE
+    bool
+    default y
--- a/components/soc/esp32h21/include/soc/soc_caps.h
+++ b/components/soc/esp32h21/include/soc/soc_caps.h
@@ -31,7 +31,7 @@
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_AHB_GDMA_SUPPORTED          1
 #define SOC_GPTIMER_SUPPORTED           1
-// #define SOC_BT_SUPPORTED                1
+#define SOC_BT_SUPPORTED                1
 #define SOC_IEEE802154_SUPPORTED        1
 #define SOC_IEEE802154_BLE_ONLY         1
 #define SOC_ASYNC_MEMCPY_SUPPORTED      1
@@ -490,12 +490,14 @@
 // #define SOC_RNG_CLOCK_IS_INDEPENDENT                          (1)

 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
-// #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
+#define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 // #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
-// #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
-// #define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
-// #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1)   /*!< Support BLE device privacy mode */
-// #define SOC_BLE_POWER_CONTROL_SUPPORTED (1)    /*!< Support Bluetooth Power Control */
-// #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1)    /*!< Support multiple connections optimization */
-// #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED  (1)    /*!< Support For BLE Periodic Adv Enhancements */
-// #define SOC_BLE_CTE_SUPPORTED           (1)    /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
+#define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */
+#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1)   /*!< Support BLE device privacy mode */
+#define SOC_BLE_POWER_CONTROL_SUPPORTED (1)    /*!< Support Bluetooth Power Control */
+#define SOC_BLE_MULTI_CONN_OPTIMIZATION (1)    /*!< Support multiple connections optimization */
+#define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED  (1)    /*!< Support For BLE Periodic Adv Enhancements */
+#define SOC_BLE_CTE_SUPPORTED           (1)    /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
+#define SOC_BLE_SUBRATE_SUPPORTED       (1)    /*!< Support Bluetooth LE Connection Subrating */
+#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE  (1)    /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */
--- a/docs/doxygen/Doxyfile_esp32h21
+++ b/docs/doxygen/Doxyfile_esp32h21
@@ -1,3 +1,5 @@
 INPUT += \
+    $(PROJECT_PATH)/components/bt/include/esp32h2/include/esp_bt.h \
+    $(PROJECT_PATH)/components/bt/include/esp32h2/include/esp_bt_vs.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_cert_test.h \
--- a/docs/en/api-guides/ble/ble-feature-support-status.rst
+++ b/docs/en/api-guides/ble/ble-feature-support-status.rst
@@ -153,19 +153,19 @@ If none of our chip series meet your needs, please contact `customer support tea
            |supported|
    * - .. centered:: |5.1|
      - Angle of Arrival (AoA)/Angle of Departure (AoD)
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only:: esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2

            |unsupported|
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only::  esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2

            |unsupported|
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only:: esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2
@@ -201,19 +201,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
    * - .. centered:: |5.2|
@@ -231,19 +231,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp31c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |5.3|
@@ -251,19 +251,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

           |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |supported|
    * -
@@ -271,19 +271,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * -
@@ -291,19 +291,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |5.4|
@@ -311,19 +311,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * -
@@ -341,19 +341,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |6.0|
@@ -366,19 +366,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
    * -
@@ -396,19 +396,19 @@ If none of our chip series meet your needs, please contact `customer support tea
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
    * -
--- a/docs/en/api-guides/ble/ble-multiconnection-guide.rst
+++ b/docs/en/api-guides/ble/ble-multiconnection-guide.rst
@@ -86,7 +86,7 @@ Note
   .. |max_bluedroid_connections| replace:: 2
   .. |max_nimble_connections| replace:: 2

-.. only:: esp32h2
+.. only:: esp32h2 or esp32h21

   .. |max_bluedroid_connections| replace:: 15
   .. |max_nimble_connections| replace:: 70
--- a/docs/en/api-guides/ble/overview.rst
+++ b/docs/en/api-guides/ble/overview.rst
@@ -13,7 +13,7 @@ This document provides an architecture overview of the Bluetooth Low Energy (Blu

    {IDF_TARGET_NAME} supports Bluetooth 5.0 (LE) and is certified for Bluetooth LE 5.4.

-.. only:: esp32c2 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+.. only:: esp32c2 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

    {IDF_TARGET_NAME} supports Bluetooth 5.0 (LE) and is certified for Bluetooth LE 5.3.

@@ -37,7 +37,7 @@ The Bluetooth LE stack in ESP-IDF is a layered architecture that enables Bluetoo

        {IDF_TARGET_NAME} Bluetooth LE Stack Architecture

-.. only:: esp32h2
+.. only:: esp32h2 or esp32h21

    .. figure:: ../../../_static/bluetooth-architecture-no-blufi.png
        :align: center
--- a/docs/en/api-reference/bluetooth/bt_vhci.rst
+++ b/docs/en/api-reference/bluetooth/bt_vhci.rst
@@ -40,7 +40,7 @@ The following HCI VS commands are exclusively for Espressif's Bluetooth Host (ES
    .. doxygendefine:: ESP_BT_VS_SET_LE_VENDOR_EVTS_MASK_OCF


-.. only:: esp32c5 or esp32c6 or esp32h2 or esp32c61 or esp32h4 or esp32s31
+.. only:: esp32c5 or esp32c6 or esp32h2 or esp32h21 or esp32c61 or esp32h4 or esp32s31

    .. doxygendefine:: ESP_BT_VS_CONFIG_DUP_EXC_LIST_OCF
    .. doxygendefine:: ESP_BT_VS_SET_ADV_REPORT_FLOW_CTRL_OCF
@@ -82,7 +82,7 @@ The following HCI VS events are exclusively for Espressif's Bluetooth Host (ESP-
    .. doxygendefine:: ESP_BT_VS_LE_ADV_LOST_EVT_SUBCODE


-.. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61 or esp32h4
+.. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61 or esp32h4

    .. doxygendefine:: ESP_BT_VS_LE_CONN_SCAN_REQ_RXED_EVT_SUBCODE
    .. doxygendefine:: ESP_BT_VS_LE_CHAN_UPDATE_COMP_EVT_SUBCODE
@@ -214,7 +214,7 @@ The following HCI VS debugging commands are implemented in Bluetooth Low Energy
    .. doxygendefine:: ESP_BT_VS_CFG_TEST_RELATED_SUBCMD_MAX


-.. only::  esp32c6 or esp32h2 or esp32c5 or esp32c61 or esp32h4
+.. only::  esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61 or esp32h4

    .. doxygendefine:: ESP_BT_VS_CFG_TEST_RELATED_OCF
    .. doxygendefine:: ESP_BT_VS_CFG_TEST_ENABLE_SUBCMD
@@ -368,7 +368,7 @@ The following HCI VS debugging commands are implemented in Bluetooth Low Energy
        .. doxygendefine:: ESP_BT_VS_CH_CLASSIFICATION_REPORTING_MODE_EVT_SUBCODE


-    .. only:: esp32c5 or esp32c6 or esp32c61 or esp32h2 or esp32h4
+    .. only:: esp32c5 or esp32c6 or esp32c61 or esp32h2 or esp32h21 or esp32h4

        .. doxygendefine:: ESP_BT_VS_LE_RUNNING_STATUS_EVT_SUBCODE

--- a/docs/zh_CN/api-guides/ble/ble-feature-support-status.rst
+++ b/docs/zh_CN/api-guides/ble/ble-feature-support-status.rst
@@ -153,19 +153,19 @@
            |supported|
    * - .. centered:: |5.1|
      - Angle of Arrival (AoA)/Angle of Departure (AoD)
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only:: esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2

            |unsupported|
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only::  esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2

            |unsupported|
-      - .. only:: esp32h2 or esp32c5 or esp32c61
+      - .. only:: esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
        .. only:: esp32 or esp32c3 or esp32s3 or esp32c6 or esp32c2
@@ -201,19 +201,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c2 or esp32c5 or esp32c61

            |supported|
    * - .. centered:: |5.2|
@@ -231,19 +231,19 @@
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c3 or esp32s3 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c3 or esp32s3 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |5.3|
@@ -251,19 +251,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

           |supported|
      - .. only:: esp32 or esp32c3 or esp32s3

            |unsupported|
-        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32c2 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |supported|
    * -
@@ -271,19 +271,19 @@
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * -
@@ -291,19 +291,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |5.4|
@@ -311,19 +311,19 @@
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c2

            |unsupported|
-        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c3 or esp32s3 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * -
@@ -341,19 +341,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |experimental|
    * - .. centered:: |6.0|
@@ -366,19 +366,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
    * -
@@ -396,19 +396,19 @@
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
      - .. only:: esp32 or esp32c3 or esp32s3 or esp32c2

            |unsupported|
-        .. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61
+        .. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

            |developing202606|
    * -
--- a/docs/zh_CN/api-guides/ble/ble-multiconnection-guide.rst
+++ b/docs/zh_CN/api-guides/ble/ble-multiconnection-guide.rst
@@ -86,7 +86,7 @@
   .. |max_bluedroid_connections| replace:: 2
   .. |max_nimble_connections| replace:: 2

-.. only:: esp32h2
+.. only:: esp32h2 or esp32h21

   .. |max_bluedroid_connections| replace:: 15
   .. |max_nimble_connections| replace:: 70
--- a/docs/zh_CN/api-guides/ble/overview.rst
+++ b/docs/zh_CN/api-guides/ble/overview.rst
@@ -13,7 +13,7 @@

    {IDF_TARGET_NAME} 支持蓝牙 5.0 (LE)，并且已经通过低功耗蓝牙 5.4 认证。

-.. only:: esp32c2 or esp32c6 or esp32h2 or esp32c5 or esp32c61
+.. only:: esp32c2 or esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61

    {IDF_TARGET_NAME} 支持蓝牙 5.0 (LE)，并且已经通过低功耗蓝牙 5.3 认证。

@@ -37,7 +37,7 @@ ESP-IDF 中的低功耗蓝牙协议栈是一个分层架构，可在 {IDF_TARGET

        {IDF_TARGET_NAME} 蓝牙协议栈架构

-.. only:: esp32h2
+.. only:: esp32h2 or esp32h21

    .. figure:: ../../../_static/bluetooth-architecture-no-blufi.png
        :align: center
--- a/docs/zh_CN/api-reference/bluetooth/bt_vhci.rst
+++ b/docs/zh_CN/api-reference/bluetooth/bt_vhci.rst
@@ -40,7 +40,7 @@
    .. doxygendefine:: ESP_BT_VS_SET_LE_VENDOR_EVTS_MASK_OCF


-.. only:: esp32c5 or esp32c6 or esp32h2 or esp32c61 or esp32h4 or esp32s31
+.. only:: esp32c5 or esp32c6 or esp32h2 or esp32h21 or esp32c61 or esp32h4 or esp32s31

    .. doxygendefine:: ESP_BT_VS_CONFIG_DUP_EXC_LIST_OCF
    .. doxygendefine:: ESP_BT_VS_SET_ADV_REPORT_FLOW_CTRL_OCF
@@ -82,7 +82,7 @@
    .. doxygendefine:: ESP_BT_VS_LE_ADV_LOST_EVT_SUBCODE


-.. only:: esp32c6 or esp32h2 or esp32c5 or esp32c61 or esp32h4
+.. only:: esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61 or esp32h4

    .. doxygendefine:: ESP_BT_VS_LE_CONN_SCAN_REQ_RXED_EVT_SUBCODE
    .. doxygendefine:: ESP_BT_VS_LE_CHAN_UPDATE_COMP_EVT_SUBCODE
@@ -214,7 +214,7 @@
    .. doxygendefine:: ESP_BT_VS_CFG_TEST_RELATED_SUBCMD_MAX


-.. only::  esp32c6 or esp32h2 or esp32c5 or esp32c61 or esp32h4
+.. only::  esp32c6 or esp32h2 or esp32h21 or esp32c5 or esp32c61 or esp32h4

    .. doxygendefine:: ESP_BT_VS_CFG_TEST_RELATED_OCF
    .. doxygendefine:: ESP_BT_VS_CFG_TEST_ENABLE_SUBCMD
@@ -368,7 +368,7 @@
        .. doxygendefine:: ESP_BT_VS_CH_CLASSIFICATION_REPORTING_MODE_EVT_SUBCODE


-    .. only:: esp32c5 or esp32c6 or esp32c61 or esp32h2 or esp32h4
+    .. only:: esp32c5 or esp32c6 or esp32c61 or esp32h2 or esp32h21 or esp32h4

        .. doxygendefine:: ESP_BT_VS_LE_RUNNING_STATUS_EVT_SUBCODE

--- a/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Beacon/README.md
+++ b/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Beacon/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # Bluedroid Beacon Example

--- a/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Connection/README.md
+++ b/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Connection/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # Bluedroid Connection Example

--- a/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_GATT_Server/README.md
+++ b/examples/bluetooth/ble_get_started/bluedroid/Bluedroid_GATT_Server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # Bluedroid GATT Server Example

--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_Beacon/README.md
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_Beacon/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # NimBLE Beacon Example

--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/README.md
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # NimBLE Connection Example

--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # NimBLE GATT Server Example

--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/README.md
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # NimBLE Security Example

--- a/examples/bluetooth/ble_uart_service/README.md
+++ b/examples/bluetooth/ble_uart_service/README.md
@@ -1,7 +1,7 @@
 # BLE UART Service Example — NimBLE / Bluedroid

-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 A turnkey serial-over-BLE peripheral that implements the de-facto
 **BLE UART-over-GATT** layout (RX write, TX notify; fixed 128-bit UUIDs
--- a/examples/bluetooth/bluedroid/ble/ble_acl_latency/cent/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_acl_latency/cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE ACL Latency Test - Central

--- a/examples/bluetooth/bluedroid/ble/ble_acl_latency/periph/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_acl_latency/periph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE ACL Latency Test - Peripheral

--- a/examples/bluetooth/bluedroid/ble/ble_ancs/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_ancs/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE ANCS Example

--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE Compatibility Test Example

--- a/examples/bluetooth/bluedroid/ble/ble_eddystone_receiver/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_eddystone_receiver/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Eddystone Example

--- a/examples/bluetooth/bluedroid/ble/ble_eddystone_sender/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_eddystone_sender/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Eddystone Example

--- a/examples/bluetooth/bluedroid/ble/ble_enc_adv_data/enc_adv_data_cent/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_enc_adv_data/enc_adv_data_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Encrypted Advertising Data Central Example (Bluedroid)

--- a/examples/bluetooth/bluedroid/ble/ble_enc_adv_data/enc_adv_data_prph/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_enc_adv_data/enc_adv_data_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Encrypted Advertising Data Peripheral Example (Bluedroid)

--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE HID Example

--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF iBeacon demo

--- a/examples/bluetooth/bluedroid/ble/ble_multi_conn/ble_multi_conn_cent/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_multi_conn/ble_multi_conn_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Multiple Connection Central Example

--- a/examples/bluetooth/bluedroid/ble/ble_multi_conn/ble_multi_conn_prph/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_multi_conn/ble_multi_conn_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Multiple Connection Peripheral Example

--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF SPP GATT CLIENT demo

--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 ## ESP-IDF GATT SERVER SPP Example

--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE throughput GATT CLIENT Test

--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE throughput GATT SERVER Test

--- a/examples/bluetooth/bluedroid/ble/gatt_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Client Example

--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Security Client Example

--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Security Server Example

--- a/examples/bluetooth/bluedroid/ble/gatt_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Server Example

--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Server Service Table Example

--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md
+++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Client Multi Connection Example

--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Gatt Security Client Example

--- a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE50 Security Server Example

--- a/examples/bluetooth/bluedroid/ble_50/ble50_throughput/throughput_client/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_throughput/throughput_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE 50 throughput GATT CLIENT Test

--- a/examples/bluetooth/bluedroid/ble_50/ble50_throughput/throughput_server/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble50_throughput/throughput_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BLE 50 throughput GATT SERVER Test

--- a/examples/bluetooth/bluedroid/ble_50/ble_conn_subrating_central/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_conn_subrating_central/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Connection Subrating Central Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_conn_subrating_peripheral/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_conn_subrating_peripheral/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Connection Subrating Peripheral Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_connection_central_with_cte/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_connection_central_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # ESP-IDF BLE Connection Central with CTE Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_connection_peripheral_with_cte/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_connection_peripheral_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # ESP-IDF BLE Connection Peripheral with CTE Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_pawr_advertiser/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_pawr_advertiser/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Advertiser Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_pawr_advertiser_conn/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_pawr_advertiser_conn/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Advertiser Connection Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_pawr_synchronizer/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_pawr_synchronizer/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # ESP-IDF PAwR Synchronizer Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_periodic_adv_with_cte/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_periodic_adv_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # ESP-IDF BLE Periodic Advertising with CTE Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_periodic_sync_with_cte/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_periodic_sync_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # ESP-IDF BLE Periodic Sync with CTE Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_power_control_central/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_power_control_central/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Power Control Central Example

--- a/examples/bluetooth/bluedroid/ble_50/ble_power_control_peripheral/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/ble_power_control_peripheral/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Power Control Peripheral Example

--- a/examples/bluetooth/bluedroid/ble_50/multi-adv/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/multi-adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 #ESP-IDF Multi Adv Example

--- a/examples/bluetooth/bluedroid/ble_50/periodic_adv/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/periodic_adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP_IDF Periodic Adv Example

--- a/examples/bluetooth/bluedroid/ble_50/periodic_sync/README.md
+++ b/examples/bluetooth/bluedroid/ble_50/periodic_sync/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF Periodic Sync Example

--- a/examples/bluetooth/bluedroid/bluedroid_host_only/bluedroid_host_only_uart/README.md
+++ b/examples/bluetooth/bluedroid/bluedroid_host_only/bluedroid_host_only_uart/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 ESP-IDF UART HCI Host
 =====================
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md
+++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 ESP-IDF Gattc and Gatts Coexistence example
 ==============================================
--- a/examples/bluetooth/esp_hid_device/README.md
+++ b/examples/bluetooth/esp_hid_device/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BT/BLE HID Device Demo

--- a/examples/bluetooth/esp_hid_host/README.md
+++ b/examples/bluetooth/esp_hid_host/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF BT/BLE HID Host Demo

--- a/examples/bluetooth/hci/ble_adv_scan_combined/README.md
+++ b/examples/bluetooth/hci/ble_adv_scan_combined/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 ESP-IDF Combined Bluetooth advertising and scanning
 ===================================================
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/README.md
+++ b/examples/bluetooth/hci/controller_vhci_ble_adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 ESP-IDF VHCI ble_advertising app
 ================================
--- a/examples/bluetooth/nimble/ble_ancs/README.md
+++ b/examples/bluetooth/nimble/ble_ancs/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # ESP-IDF NimBLE ANCS Example

--- a/examples/bluetooth/nimble/ble_cte/ble_periodic_adv_with_cte/README.md
+++ b/examples/bluetooth/nimble/ble_cte/ble_periodic_adv_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # Bluetooth LE Direction Finding Example (Periodic Advertiser With CTE)

--- a/examples/bluetooth/nimble/ble_cte/ble_periodic_sync_with_cte/README.md
+++ b/examples/bluetooth/nimble/ble_cte/ble_periodic_sync_with_cte/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # Bluetooth LE Direction Finding Example (Periodic Sync with CTE) 

--- a/examples/bluetooth/nimble/ble_cts/cts_cent/README.md
+++ b/examples/bluetooth/nimble/ble_cts/cts_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE CTS Cent Example

--- a/examples/bluetooth/nimble/ble_cts/cts_prph/README.md
+++ b/examples/bluetooth/nimble/ble_cts/cts_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Current Time Service Example

--- a/examples/bluetooth/nimble/ble_dynamic_service/README.md
+++ b/examples/bluetooth/nimble/ble_dynamic_service/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Dynamic Service Example

--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Encrypted Advertising Data Central Example

--- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md
+++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Encrypted Advertising Data Peripheral Example

--- a/examples/bluetooth/nimble/ble_gattc_gatts_coex/README.md
+++ b/examples/bluetooth/nimble/ble_gattc_gatts_coex/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE GATTC GATTS Coex Example

--- a/examples/bluetooth/nimble/ble_htp/htp_cent/README.md
+++ b/examples/bluetooth/nimble/ble_htp/htp_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE HTP Cent Example

--- a/examples/bluetooth/nimble/ble_htp/htp_prph/README.md
+++ b/examples/bluetooth/nimble/ble_htp/htp_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Heart Rate Measurement Example

--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/README.md
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Central L2CAP COC Example

--- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/README.md
+++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Peripheral L2CAP COC Example

--- a/examples/bluetooth/nimble/ble_multi_adv/README.md
+++ b/examples/bluetooth/nimble/ble_multi_adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Multi Adv Example

--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/README.md
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Multiple Connection Central Example

--- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/README.md
+++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Multiple Connection Peripheral Example

--- a/examples/bluetooth/nimble/ble_pawr_adv/ble_pawr_adv/README.md
+++ b/examples/bluetooth/nimble/ble_pawr_adv/ble_pawr_adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Advertiser Example

--- a/examples/bluetooth/nimble/ble_pawr_adv/ble_pawr_sync/README.md
+++ b/examples/bluetooth/nimble/ble_pawr_adv/ble_pawr_sync/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Sync Example

--- a/examples/bluetooth/nimble/ble_pawr_adv_conn/ble_pawr_adv_conn/README.md
+++ b/examples/bluetooth/nimble/ble_pawr_adv_conn/ble_pawr_adv_conn/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Advertiser Connection Example

--- a/examples/bluetooth/nimble/ble_pawr_adv_conn/ble_pawr_sync_conn/README.md
+++ b/examples/bluetooth/nimble/ble_pawr_adv_conn/ble_pawr_sync_conn/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S31 |
-| ----------------- | -------- | -------- | --------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | -------- | --------- | -------- | --------- | -------- | --------- |

 # BLE Periodic Advertiser With Response (PAwR) Sync Connection Example

--- a/examples/bluetooth/nimble/ble_periodic_adv/README.md
+++ b/examples/bluetooth/nimble/ble_periodic_adv/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Periodic Advertiser Example

--- a/examples/bluetooth/nimble/ble_periodic_sync/README.md
+++ b/examples/bluetooth/nimble/ble_periodic_sync/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Periodic Sync Example

--- a/examples/bluetooth/nimble/ble_phy/phy_cent/README.md
+++ b/examples/bluetooth/nimble/ble_phy/phy_cent/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Central PHY Example

--- a/examples/bluetooth/nimble/ble_phy/phy_prph/README.md
+++ b/examples/bluetooth/nimble/ble_phy/phy_prph/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
-| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | --------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-S3 | ESP32-S31 |
+| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | --------- |

 # BLE Peripheral PHY Example

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`source "$IDF_PATH/components/bt/controller/esp32h2/Kconfig.in"`