From: Liu Zhi Fu <liuzhifu@espressif.com>
Date: Tue, 8 Nov 2016 05:30:35 +0000 (+0800)
Subject: esp32: merge bt/wifi coexist code
X-Git-Tag: v1.0~75^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=178db4bdd91c37b2fd633930c8df44233b496e1c;p=esp-idf

esp32: merge bt/wifi coexist code

1. Modify makefile to add coexist lib
2. Update bt/wifi coexist lib
---

diff --git a/components/esp32/component.mk b/components/esp32/component.mk
index e91020c3e6..c658787d87 100644
--- a/components/esp32/component.mk
+++ b/components/esp32/component.mk
@@ -10,7 +10,7 @@
 
 COMPONENT_SRCDIRS := . hwcrypto
 
-LIBS := core net80211 phy rtc pp wpa smartconfig
+LIBS := 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 b3090d8854..a1ab74c2a6 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit b3090d885413fb78c86e7b88116cdb5c8c5e9e68
+Subproject commit a1ab74c2a6122693ee87f08306364fc7a016ced7