From 1540469598220fe5923b21e54ee7de4a0fc7622e Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Thu, 3 Nov 2016 16:28:04 +0800 Subject: [PATCH] component/esp32 component/bt : seperate phy init --- components/bt/component.mk | 2 +- components/bt/lib | 2 +- components/esp32/component.mk | 2 +- components/esp32/lib | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/bt/component.mk b/components/bt/component.mk index 1926f857d5..5bb01a8138 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -33,7 +33,7 @@ COMPONENT_ADD_INCLUDEDIRS := bluedroid/bta/include \ CFLAGS += -Wno-error=unused-label -Wno-error=return-type -Wno-error=missing-braces -Wno-error=pointer-sign -Wno-error=parentheses -LIBS := btdm_app +LIBS := btdm_app coexist COMPONENT_ADD_LDFLAGS := -lbt -L$(abspath lib) \ $(addprefix -l,$(LIBS)) \ diff --git a/components/bt/lib b/components/bt/lib index 116bca5495..0f11ccac9a 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 116bca54958c21b8b5b5f79a427744131e21f12a +Subproject commit 0f11ccac9a5f39e28e5d8904634c54acd4f140fd diff --git a/components/esp32/component.mk b/components/esp32/component.mk index 788f880127..249d533fae 100644 --- a/components/esp32/component.mk +++ b/components/esp32/component.mk @@ -10,7 +10,7 @@ COMPONENT_SRCDIRS := . hwcrypto -LIBS := crypto core net80211 phy rtc pp wpa smartconfig +LIBS := crypto core net80211 phy rtc pp wpa smartconfig coexist LINKER_SCRIPTS += -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld diff --git a/components/esp32/lib b/components/esp32/lib index 01d2e6e22e..2afb6bb13e 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit 01d2e6e22e439edcdc289991b667d13a0908128d +Subproject commit 2afb6bb13ec50bf46128331fa7b6835d672c0414 -- 2.40.0