Merge branch 'refactor/rename_h2_to_h4' into 'master'

esp32h2: renaming esp32h2 to esp32h4

Closes IDF-6098

See merge request espressif/esp-idf!20676

components/bt/CMakeLists.txt

@@ -17,9 +17,9 @@ if(CONFIG_BT_ENABLED)
         list(APPEND srcs "controller/esp32s3/bt.c")
         list(APPEND include_dirs include/esp32s3/include)
 
-    elseif(CONFIG_IDF_TARGET_ESP32H2)
-        list(APPEND srcs "controller/esp32h2/bt.c")
-        list(APPEND include_dirs include/esp32h2/include)
+    elseif(CONFIG_IDF_TARGET_ESP32H4)
+        list(APPEND srcs "controller/esp32h4/bt.c")
+        list(APPEND include_dirs include/esp32h4/include)
 
     elseif(CONFIG_IDF_TARGET_ESP32C2)
         list(APPEND srcs "controller/esp32c2/bt.c")
@@ -699,10 +699,12 @@ if(CONFIG_BT_ENABLED)
         target_link_directories(${COMPONENT_LIB} INTERFACE
                 "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3")
         target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
-    elseif(CONFIG_IDF_TARGET_ESP32H2)
-        if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_1)
+    elseif(CONFIG_IDF_TARGET_ESP32H4)
+        if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_1)
+            # TODO: rename esp32h2 to esp32h4 [BT-2875]
             add_prebuilt_library(nimblelib "controller/lib_esp32h2/esp32h2-bt-lib/beta1/libble_app.a")
-        elseif(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2)
+        elseif(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2)
+            # TODO: rename esp32h2 to esp32h4 [BT-2875]
             add_prebuilt_library(nimblelib "controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a")
         endif()
         target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib)

components/bt/controller/esp32h4/bt.c

@@ -567,10 +567,10 @@ void controller_sleep_deinit(void)
 
 }
 
-#if CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2
+#if CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2
 void periph_module_etm_active(void)
 {
-    /*This part for esp32h2 beta2*/
+    /*This part for esp32h4 beta2*/
     REG_SET_BIT(SYSTEM_MODCLK_CONF_REG, SYSTEM_ETM_CLK_SEL | SYSTEM_ETM_CLK_ACTIVE ); //Active ETM clock
 }
 #endif
@@ -625,8 +625,8 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
 #endif
 
     periph_module_enable(PERIPH_BT_MODULE);
-#if CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2
-    // only use for esp32h2 beta2
+#if CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2
+    // only use for esp32h4 beta2
     periph_module_etm_active();
 #endif
 

components/bt/host/bluedroid/Kconfig.in

@@ -1096,7 +1096,7 @@ config BT_BLE_RPA_SUPPORTED
         cannot be used. This option is disabled by default on ESP32, please enable or disable this option according
         to your own needs.
 
-        For ESP32C3, ESP32S3, ESP32H2 and ESP32C2, devices support network privacy mode and device privacy mode,
+        For ESP32C3, ESP32S3, ESP32H4 and ESP32C2, devices support network privacy mode and device privacy mode,
         users can switch the two modes according to their own needs. So this option is enabled by default.
 
 config BT_BLE_50_FEATURES_SUPPORTED

components/bt/host/nimble/Kconfig.in

@@ -64,10 +64,10 @@ config BT_NIMBLE_LOG_LEVEL
 
 config BT_NIMBLE_MAX_CONNECTIONS
     int "Maximum number of concurrent connections"
-    range 1 8 if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2)
+    range 1 8 if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H4)
     range 1 2 if IDF_TARGET_ESP32C2
     range 1 9 if IDF_TARGET_ESP32
-    default 3 if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2)
+    default 3 if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H4)
     default 2 if IDF_TARGET_ESP32C2
     depends on BT_NIMBLE_ENABLED
     help
@@ -483,7 +483,7 @@ config BT_NIMBLE_HOST_BASED_PRIVACY
 
 config BT_NIMBLE_ENABLE_CONN_REATTEMPT
     bool "Enable connection reattempts on connection establishment error"
-    default y if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C2)
+    default y if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H4 || IDF_TARGET_ESP32C2)
     default n if IDF_TARGET_ESP32
     help
         Enable to make the NimBLE host to reattempt GAP connection on connection
@@ -579,7 +579,7 @@ config BT_NIMBLE_MAX_PERIODIC_SYNCS
 
 config BT_NIMBLE_MAX_PERIODIC_ADVERTISER_LIST
     int "Maximum number of periodic advertiser list"
-    depends on BT_NIMBLE_50_FEATURE_SUPPORT && (IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2)
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT && (IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H4)
     range 1 5
     default 5 if BT_NIMBLE_50_FEATURE_SUPPORT
     help

components/bt/porting/nimble/include/nimble/ble_hci_trans.h

@@ -66,7 +66,7 @@ struct os_mbuf;
 typedef int ble_hci_trans_rx_cmd_fn(uint8_t *cmd, void *arg);
 typedef int ble_hci_trans_rx_acl_fn(struct os_mbuf *om, void *arg);
 
-#if CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2
+#if CONFIG_IDF_TARGET_ESP32H4 || CONFIG_IDF_TARGET_ESP32C2
 struct ble_hci_trans_funcs_t {
     int(*_ble_hci_trans_hs_acl_tx)(struct os_mbuf *om);
     int(*_ble_hci_trans_hs_cmd_tx)(uint8_t *cmd);

components/bt/porting/nimble/include/nimble/nimble_port.h

@@ -27,7 +27,7 @@
 
 #define NIMBLE_HS_STACK_SIZE CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
 
-#if (CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2)
+#if (CONFIG_IDF_TARGET_ESP32H4 || CONFIG_IDF_TARGET_ESP32C2)
 #define NIMBLE_LL_STACK_SIZE CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE
 #endif