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

Merge pull request #15835 from leandrolanzieri/pr/makefile/fix_default_modules_in_usemodules

Browse Source 
Makefile.include: avoid recursive expansion of USEMODULE
This commit is contained in:
Francisco 2021-01-25 21:50:03 +01:00 committed by GitHub
commit de9f29cf42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.include
View File

@ -387,6 +387,9 @@ else
# handle removal of default modules # handle removal of default modules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE)) USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
# avoid recursive expansion
USEMODULE := $(sort $(USEMODULE))
# process dependencies # process dependencies
include $(RIOTMAKE)/dependency_resolution.inc.mk include $(RIOTMAKE)/dependency_resolution.inc.mk
endif endif

2
boards/common/e104-bt50xxa-tb/Makefile.default Normal file
View File

@ -0,0 +1,2 @@
# Default modules for e104-bt50xxa-tb boards
DEFAULT_MODULE += board_software_reset

2
boards/common/e104-bt50xxa-tb/Makefile.dep
View File

@ -7,6 +7,4 @@ ifneq (,$(filter board_software_reset,$(USEMODULE)))
FEATURES_REQUIRED += periph_gpio_irq FEATURES_REQUIRED += periph_gpio_irq
endif endif
DEFAULT_MODULE += board_software_reset
include $(RIOTBOARD)/common/nrf52/Makefile.dep include $(RIOTBOARD)/common/nrf52/Makefile.dep

1
boards/e104-bt5010a-tb/Makefile.default Normal file
View File

@ -0,0 +1 @@
include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default

1
boards/e104-bt5011a-tb/Makefile.default Normal file
View File

@ -0,0 +1 @@
include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default

2
cpu/msp430_common/Makefile.default Normal file
View File

@ -0,0 +1,2 @@
# msp430 uses newlib by default
DEFAULT_MODULE += newlib

3
cpu/msp430_common/Makefile.dep
View File

@ -1,8 +1,5 @@
USEMODULE += msp430_common msp430_common_periph USEMODULE += msp430_common msp430_common_periph
# msp430 uses newlib by default
DEFAULT_MODULE += newlib
ifneq (,$(filter newlib,$(USEMODULE))) ifneq (,$(filter newlib,$(USEMODULE)))
USEMODULE += newlib_nano USEMODULE += newlib_nano
endif endif

1
cpu/msp430fxyz/Makefile.default Normal file
View File

@ -0,0 +1 @@
include $(RIOTCPU)/msp430_common/Makefile.default

6
makefiles/defaultmodules.inc.mk
View File

@ -4,3 +4,9 @@ DEFAULT_MODULE += auto_init
# Initialize all used peripherals by default # Initialize all used peripherals by default
DEFAULT_MODULE += periph_init DEFAULT_MODULE += periph_init
# Include potentially added default modules by the board
-include $(BOARDDIR)/Makefile.default
# Include potentially added default modules by the CPU
-include $(RIOTCPU)/$(CPU)/Makefile.default

1
sys/Makefile.dep
View File

@ -723,6 +723,7 @@ endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))
DEFAULT_MODULE += auto_init_saul DEFAULT_MODULE += auto_init_saul
DEFAULT_MODULE += saul_init_devs
USEMODULE += saul USEMODULE += saul
USEMODULE += saul_reg USEMODULE += saul_reg
endif endif