Merge branch 'support/libot_lib154_rename_h2_to_h4' into 'master'

openthread: rename h2 to h4

See merge request espressif/esp-idf!21041

components/ieee802154/CMakeLists.txt

@@ -14,14 +14,12 @@ if(CONFIG_IEEE802154_ENABLED)
     else()
         if(IDF_TARGET STREQUAL "esp32h4")
             if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_1)
-                # TODO: rename esp32h2 to esp32h4 [IDF-6097]
                 target_link_libraries(${COMPONENT_LIB} INTERFACE
-                            "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32h2/rev1")
+                            "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${idf_target}/rev1")
             endif()
             if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2)
-                # TODO: rename esp32h2 to esp32h4 [IDF-6097]
                 target_link_libraries(${COMPONENT_LIB} INTERFACE
-                            "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32h2/rev2")
+                            "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${idf_target}/rev2")
             endif()
         else()
             target_link_directories(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/lib/${idf_target}")

components/ieee802154/lib

@@ -1 +1 @@
-Subproject commit 2b52a261fef2ad7b630e11866dca567d17170401
+Subproject commit 56a56502a037c8196d2b5dd5790bb90ff60d9d0e

components/openthread/CMakeLists.txt

@@ -194,15 +194,13 @@ if(CONFIG_OPENTHREAD_ENABLED)
     else()
         if(IDF_TARGET STREQUAL "esp32h4")
         if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_1)
-                # TODO: rename esp32h2 to esp32h4 [IDF-6097]
                 add_prebuilt_library(openthread_port
-                    "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32h2/rev1/libopenthread_port.a"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/lib/${idf_target}/rev1/libopenthread_port.a"
                     REQUIRES openthread)
             endif()
             if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2)
-                # TODO: rename esp32h2 to esp32h4 [IDF-6097]
                 add_prebuilt_library(openthread_port
-                    "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32h2/rev2/libopenthread_port.a"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/lib/${idf_target}/rev2/libopenthread_port.a"
                     REQUIRES openthread)
             endif()
         else()

components/openthread/lib

@@ -1 +1 @@
-Subproject commit 698e8386c31f2c34e167b65f72a6b2553e838dd9
+Subproject commit 6a863c104ef982df8dfc0a499588c4334528b86c