From 9bba4b9aa55593d878f5c2ebb1152ecce65d7c99 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 23 Nov 2018 18:04:19 +0100 Subject: [PATCH] cpu/esp32: fixes LINKFLAGS in Makfile.include This commit adds the ESP32 vendor libraries for WLAN to the BASELIBS variable. This avoids having to define an additional archive group in the LINKGFLAGS variable which contains these vendor libraries and again RIOT module archive files with the symbols that are refered by these vendor libraries. --- cpu/esp32/Makefile.include | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index 12ff0b1afa..69da81e074 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -118,28 +118,13 @@ endif LINKFLAGS += -L$(ESP32_SDK_DIR)/components/esp32 LINKFLAGS += -L$(ESP32_SDK_DIR)/components/esp32/lib -LINKFLAGS += -Wl,--start-group ifneq (,$(filter esp_wifi_any,$(USEMODULE))) - LINKFLAGS += $(BINDIR)/cpu.a - LINKFLAGS += $(BINDIR)/esp_idf.a - LINKFLAGS += $(BINDIR)/esp_idf_esp32.a - LINKFLAGS += $(BINDIR)/esp_idf_nvs_flash.a - LINKFLAGS += $(BINDIR)/esp_idf_spi_flash.a - LINKFLAGS += $(BINDIR)/pthread.a - LINKFLAGS += $(BINDIR)/riot_freertos.a - LINKFLAGS += $(BINDIR)/xtimer.a - LINKFLAGS += -lcore -lrtc -lnet80211 -lpp -lsmartconfig -lcoexist - LINKFLAGS += -lwps -lwpa -lwpa2 -lespnow -lmesh -lphy -lstdc++ -endif - -ifneq (,$(filter pthread,$(USEMODULE))) - LINKFLAGS += $(BINDIR)/core.a - LINKFLAGS += $(BINDIR)/pthread.a + BASELIBS += -lcore -lrtc -lnet80211 -lpp -lsmartconfig -lcoexist + BASELIBS += -lwps -lwpa -lwpa2 -lespnow -lmesh -lphy -lstdc++ endif LINKFLAGS += -lhal -lg -lc -lg -LINKFLAGS += -Wl,--end-group LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ld/ LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ld/esp32.ld LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ld/esp32.common.ld