Merge branch 'feature/support_ble_for_esp32c6' into 'master'

support ble for esp32c6 See merge request espressif/esp-idf!21866
espressif · Jan 4, 2023 · bdf3001 · bdf3001
2 parents 8020407 + e41b35b
commit bdf3001
Show file tree

Hide file tree

Showing 24 changed files with 2,255 additions and 71 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -79,6 +79,10 @@
 	path = components/bt/controller/lib_esp32c2/esp32c2-bt-lib
 	url = ../../espressif/esp32c2-bt-lib.git
 
+[submodule "components/bt/controller/lib_esp32c6/esp32c6-bt-lib"]
+	path = components/bt/controller/lib_esp32c6/esp32c6-bt-lib
+	url = ../../espressif/esp32c6-bt-lib.git
+
 [submodule "components/heap/tlsf"]
 	path = components/heap/tlsf
 	url = ../../espressif/tlsf.git
diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
@@ -24,6 +24,10 @@ if(CONFIG_BT_ENABLED)
     elseif(CONFIG_IDF_TARGET_ESP32C2)
         list(APPEND srcs "controller/esp32c2/bt.c")
         list(APPEND include_dirs include/esp32c2/include)
+
+    elseif(CONFIG_IDF_TARGET_ESP32C6)
+        list(APPEND srcs "controller/esp32c6/bt.c")
+        list(APPEND include_dirs include/esp32c6/include)
     endif()
 
 
@@ -712,6 +716,9 @@ if(CONFIG_BT_ENABLED)
     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)
+    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)
     endif()
 
     set_source_files_properties(