alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/tw8387_merge_bt_wifi_coexist_code' into 'master'

Browse Source 
esp32: merge bt/wifi coexist code

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

See merge request !185
This commit is contained in:
Wu Jian Gang 2016-11-08 17:18:57 +08:00
commit 0aca2506fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/component.mk
View File

@ -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

2
components/esp32/lib

@ -1 +1 @@
Subproject commit b3090d885413fb78c86e7b88116cdb5c8c5e9e68
Subproject commit 596a82d4e0122432a51d3ec5a62975db9fd38179