esp32: merge bt/wifi coexist code

1. Modify makefile to add coexist lib
2. Update bt/wifi coexist lib
This commit is contained in:
Liu Zhi Fu 2016-11-08 13:30:35 +08:00
parent 0762b050dd
commit 178db4bdd9
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@
COMPONENT_SRCDIRS := . hwcrypto 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 LINKER_SCRIPTS += -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld

@ -1 +1 @@
Subproject commit b3090d885413fb78c86e7b88116cdb5c8c5e9e68 Subproject commit a1ab74c2a6122693ee87f08306364fc7a016ced7