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

Makefile.include: avoid recursive expansion of USEMODULE
2021-01-25 21:50:03 +01:00 · 2021-01-25 21:50:03 +01:00 · de9f29cf42
commit de9f29cf42
parent 83201ddb00 91ff4e5ce5
10 changed files with 17 additions and 5 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -387,6 +387,9 @@ else
  # handle removal of default modules
  USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))

+  # avoid recursive expansion
+  USEMODULE := $(sort $(USEMODULE))
+
  # process dependencies
  include $(RIOTMAKE)/dependency_resolution.inc.mk
 endif
--- a/boards/common/e104-bt50xxa-tb/Makefile.default
+++ b/boards/common/e104-bt50xxa-tb/Makefile.default
@ -0,0 +1,2 @@
+# Default modules for e104-bt50xxa-tb boards
+DEFAULT_MODULE += board_software_reset
--- a/boards/common/e104-bt50xxa-tb/Makefile.dep
+++ b/boards/common/e104-bt50xxa-tb/Makefile.dep
@ -7,6 +7,4 @@ ifneq (,$(filter board_software_reset,$(USEMODULE)))
  FEATURES_REQUIRED += periph_gpio_irq
 endif

-DEFAULT_MODULE += board_software_reset
-
 include $(RIOTBOARD)/common/nrf52/Makefile.dep
--- a/boards/e104-bt5010a-tb/Makefile.default
+++ b/boards/e104-bt5010a-tb/Makefile.default
@ -0,0 +1 @@
+include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default
--- a/boards/e104-bt5011a-tb/Makefile.default
+++ b/boards/e104-bt5011a-tb/Makefile.default
@ -0,0 +1 @@
+include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default
--- a/cpu/msp430_common/Makefile.default
+++ b/cpu/msp430_common/Makefile.default
@ -0,0 +1,2 @@
+# msp430 uses newlib by default
+DEFAULT_MODULE += newlib
--- a/cpu/msp430_common/Makefile.dep
+++ b/cpu/msp430_common/Makefile.dep
@ -1,8 +1,5 @@
 USEMODULE += msp430_common msp430_common_periph

-# msp430 uses newlib by default
-DEFAULT_MODULE += newlib
-
 ifneq (,$(filter newlib,$(USEMODULE)))
  USEMODULE += newlib_nano
 endif
--- a/cpu/msp430fxyz/Makefile.default
+++ b/cpu/msp430fxyz/Makefile.default
@ -0,0 +1 @@
+include $(RIOTCPU)/msp430_common/Makefile.default
--- a/makefiles/defaultmodules.inc.mk
+++ b/makefiles/defaultmodules.inc.mk
@ -4,3 +4,9 @@ DEFAULT_MODULE += auto_init

 # Initialize all used peripherals by default
 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
--- a/sys/Makefile.dep
+++ b/sys/Makefile.dep
@ -723,6 +723,7 @@ endif

 ifneq (,$(filter saul_default,$(USEMODULE)))
  DEFAULT_MODULE += auto_init_saul
+  DEFAULT_MODULE += saul_init_devs
  USEMODULE += saul
  USEMODULE += saul_reg
 endif
				`@ -0,0 +1 @@`
				`include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default`
				`@ -0,0 +1 @@`
				`include $(RIOTCPU)/msp430_common/Makefile.default`