From cdcb85fd7087492ca3468374f5917006aeee7cae Mon Sep 17 00:00:00 2001
From: wangmengyang <wangmengyang@espressif.com>
Date: Thu, 22 Apr 2021 07:46:55 +0800
Subject: [PATCH] component/bt: add another bt-lib submodule and refactor the
 directories

# Conflicts:
#	.gitmodules
#	components/bt/component.mk
---
 .gitmodules                                 | 8 ++++++++
 components/bt/CMakeLists.txt                | 8 +++++---
 components/bt/component.mk                  | 6 +++---
 components/bt/controller/lib_esp32          | 1 +
 components/bt/controller/lib_esp32c3_family | 1 +
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 160000 components/bt/controller/lib_esp32
 create mode 160000 components/bt/controller/lib_esp32c3_family

diff --git a/.gitmodules b/.gitmodules
index 91ca865f55..73dae85efa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,10 @@
 	path = components/esptool_py/esptool
 	url = ../../espressif/esptool.git
 
+[submodule "components/bt/controller/lib_esp32"]
+	path = components/bt/controller/lib_esp32
+	url = ../../espressif/esp32-bt-lib.git
+
 [submodule "components/bootloader/subproject/components/micro-ecc/micro-ecc"]
 	path = components/bootloader/subproject/components/micro-ecc/micro-ecc
 	url = ../../kmackay/micro-ecc.git
@@ -86,3 +90,7 @@
 [submodule "components/cmock/CMock"]
 	path = components/cmock/CMock
 	url = ../../ThrowTheSwitch/CMock.git
+
+[submodule "components/bt/controller/lib_esp32c3_family"]
+	path = components/bt/controller/lib_esp32c3_family
+	url = ../../espressif/esp32c3-bt-lib.git
diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index aa97d41ee8..1c4e64aeba 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -589,13 +589,15 @@ idf_component_register(SRCS "${srcs}"
 if(CONFIG_BT_ENABLED)
     target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable)
     if(CONFIG_IDF_TARGET_ESP32)
-        target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32")
+        target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32/esp32")
         target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
     elseif(CONFIG_IDF_TARGET_ESP32C3)
-        target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32c3")
+        target_link_libraries(${COMPONENT_LIB} INTERFACE
+                "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32c3")
         target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app btbb)
     elseif(CONFIG_IDF_TARGET_ESP32S3)
-        target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32s3")
+        target_link_libraries(${COMPONENT_LIB} INTERFACE
+                "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3")
         target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app btbb)
     endif()
 endif()
diff --git a/components/bt/component.mk b/components/bt/component.mk
index 7d5019f242..9f909cef8d 100644
--- a/components/bt/component.mk
+++ b/components/bt/component.mk
@@ -9,13 +9,13 @@ COMPONENT_ADD_INCLUDEDIRS := include
 
 LIBS := btdm_app
 
-COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib/esp32 \
+COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib_esp32/esp32 \
                            $(addprefix -l,$(LIBS))
 
 # re-link program if BT binary libs change
-COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/esp32/lib%.a,$(LIBS))
+COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib_esp32/esp32/lib%.a,$(LIBS))
 
-COMPONENT_SUBMODULES += controller/lib
+COMPONENT_SUBMODULES += controller/lib_esp32
 
 
 # TODO: annotate fallthroughs in Bluedroid code with comments
diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32
new file mode 160000
index 0000000000..ec61ca3caa
--- /dev/null
+++ b/components/bt/controller/lib_esp32
@@ -0,0 +1 @@
+Subproject commit ec61ca3caa64874e11f39a92654b4160bb5db06e
diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family
new file mode 160000
index 0000000000..1a2bb28e73
--- /dev/null
+++ b/components/bt/controller/lib_esp32c3_family
@@ -0,0 +1 @@
+Subproject commit 1a2bb28e734fd2a3e5ec8db38c09aee0b08677c9