riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/esp: Move dependency resolution of esp_gdb to Makefile.dep

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-03-10 11:57:42 +01:00
parent 7a30795a8c
commit f918b97ec3
No known key found for this signature in database
GPG Key ID: 39607DE6080007A3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/esp_common/Makefile.dep
View File

@ -35,6 +35,10 @@ ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
endif endif
endif endif
ifneq (,$(filter esp_gdbstub,$(USEMODULE)))
USEMODULE += esp_gdb
endif
# each device has SPI flash memory, but it has to be enabled explicitly # each device has SPI flash memory, but it has to be enabled explicitly
ifneq (,$(filter esp_spiffs,$(USEMODULE))) ifneq (,$(filter esp_spiffs,$(USEMODULE)))
USEMODULE += spiffs USEMODULE += spiffs

9
cpu/esp_common/Makefile.include
View File

@ -7,10 +7,6 @@ FLASH_MODE ?= dout
# SPECIAL module dependencies # SPECIAL module dependencies
# cannot be done in Makefile.dep since Makefile.dep is included too late # cannot be done in Makefile.dep since Makefile.dep is included too late
ifneq (,$(filter esp_gdbstub,$(USEMODULE)))
USEMODULE += esp_gdb
endif
ifneq (,$(filter log_color,$(USEMODULE))) ifneq (,$(filter log_color,$(USEMODULE)))
USEMODULE += esp_log_colored USEMODULE += esp_log_colored
endif endif
@ -55,12 +51,9 @@ ASFLAGS += --longcalls --text-section-literals
ARFLAGS = rcs ARFLAGS = rcs
CFLAGS_DBG ?= -ggdb -g3 CFLAGS_DBG ?= -ggdb -g3
CFLAGS_OPT ?= -Os
# override default CFLAGS_OPT in case module esp_gdb is enabled # override default CFLAGS_OPT in case module esp_gdb is enabled
ifneq (,$(filter esp_gdb,$(USEMODULE))) CFLAGS_OPT ?= $(if $(filter esp_gdb,$(USEMODULE)),-Og,-Os)
CFLAGS_OPT = -Og
endif
CFLAGS += $(CFLAGS_OPT) $(CFLAGS_DBG) CFLAGS += $(CFLAGS_OPT) $(CFLAGS_DBG)