Merge branch 'feature/support_ble_on_esp32h2' into 'master'

Feature/support ble on esp32h2 Closes IDF-6416 and IDF-6337 See merge request espressif/esp-idf!22221
espressif · Mar 7, 2023 · 3ab20c1 · 3ab20c1
2 parents a3b5472 + e77a07e
commit 3ab20c1
Show file tree

Hide file tree

Showing 10 changed files with 2,250 additions and 17 deletions.
diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
@@ -28,6 +28,10 @@ if(CONFIG_BT_ENABLED)
     elseif(CONFIG_IDF_TARGET_ESP32C6)
         list(APPEND srcs "controller/esp32c6/bt.c")
         list(APPEND include_dirs include/esp32c6/include)
+
+    elseif(CONFIG_IDF_TARGET_ESP32H2)
+        list(APPEND srcs "controller/esp32h2/bt.c")
+        list(APPEND include_dirs include/esp32h2/include)
     endif()
 
 
@@ -713,18 +717,21 @@ if(CONFIG_BT_ENABLED)
     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")
+            add_prebuilt_library(libble_app "controller/lib_esp32h2/esp32h2-bt-lib/beta1/libble_app.a")
         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")
+            add_prebuilt_library(libble_app "controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a")
         endif()
-        target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib)
+        target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
     elseif(CONFIG_IDF_TARGET_ESP32C2)
-        add_prebuilt_library(nimblelib "controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a")
-        target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib)
+        add_prebuilt_library(libble_app "controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a")
+        target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
     elseif(CONFIG_IDF_TARGET_ESP32C6)
-        add_prebuilt_library(nimblelib "controller/lib_esp32c6/esp32c6-bt-lib/libble_app.a")
-        target_link_libraries(${COMPONENT_LIB} PRIVATE nimblelib)
+        add_prebuilt_library(libble_app "controller/lib_esp32c6/esp32c6-bt-lib/libble_app.a")
+        target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
+    elseif(CONFIG_IDF_TARGET_ESP32H2)
+        add_prebuilt_library(libble_app "controller/lib_esp32h2/esp32h2-bt-lib/libble_app.a")
+        target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
     endif()
 
     set_source_files_properties(