espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/libot_lib154_rename_h2_to_h4' into 'master'

Browse Source 
openthread: rename h2 to h4

See merge request espressif/esp-idf!21041
This commit is contained in:
Shu Chen
2022-11-21 14:10:19 +08:00
parent 54954518b1 33467831fc
commit c9b77bc662
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/ieee802154/CMakeLists.txt
View File

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

2
components/ieee802154/lib

Submodule components/ieee802154/lib updated: 2b52a261fe...56a56502a0

6
components/openthread/CMakeLists.txt
View File

@@ -194,15 +194,13 @@ if(CONFIG_OPENTHREAD_ENABLED)
else() else()
if(IDF_TARGET STREQUAL "esp32h4") if(IDF_TARGET STREQUAL "esp32h4")
if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_1) if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_1)
# TODO: rename esp32h2 to esp32h4 [IDF-6097]
add_prebuilt_library(openthread_port 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) REQUIRES openthread)
endif() endif()
if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2) if(CONFIG_IDF_TARGET_ESP32H4_BETA_VERSION_2)
# TODO: rename esp32h2 to esp32h4 [IDF-6097]
add_prebuilt_library(openthread_port 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) REQUIRES openthread)
endif() endif()
else() else()

2
components/openthread/lib

Submodule components/openthread/lib updated: 698e8386c3...6a863c104e