From 735c47ef65b18810fdd415852a7ccc1144520920 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Fri, 22 Jan 2021 09:15:36 +0100 Subject: [PATCH 1/5] makefile.include: avoid recursive expansion of USEMODULE --- Makefile.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.include b/Makefile.include index 69cc428e57..07eee030d5 100644 --- 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 From 645ac53fe0d60a69387b1813e01251636adf0e30 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Fri, 22 Jan 2021 11:47:11 +0100 Subject: [PATCH 2/5] makefiles: allow boards and CPUs to define default modules This allows boards and CPUs to define a Makefile.default file where default modules can be added before the normal dependency resolution. --- makefiles/defaultmodules.inc.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/makefiles/defaultmodules.inc.mk b/makefiles/defaultmodules.inc.mk index 2eee5cad37..f0bc0f9bad 100644 --- 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 From 150b086c3fb73c76051dd854e761fc981e05e0a7 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Fri, 22 Jan 2021 11:48:20 +0100 Subject: [PATCH 3/5] boards/e104-bt50xxa-tb: move default module to Makefile.default --- boards/common/e104-bt50xxa-tb/Makefile.default | 2 ++ boards/common/e104-bt50xxa-tb/Makefile.dep | 2 -- boards/e104-bt5010a-tb/Makefile.default | 1 + boards/e104-bt5011a-tb/Makefile.default | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 boards/common/e104-bt50xxa-tb/Makefile.default create mode 100644 boards/e104-bt5010a-tb/Makefile.default create mode 100644 boards/e104-bt5011a-tb/Makefile.default diff --git a/boards/common/e104-bt50xxa-tb/Makefile.default b/boards/common/e104-bt50xxa-tb/Makefile.default new file mode 100644 index 0000000000..9e448d4ffc --- /dev/null +++ b/boards/common/e104-bt50xxa-tb/Makefile.default @@ -0,0 +1,2 @@ +# Default modules for e104-bt50xxa-tb boards +DEFAULT_MODULE += board_software_reset diff --git a/boards/common/e104-bt50xxa-tb/Makefile.dep b/boards/common/e104-bt50xxa-tb/Makefile.dep index e3cbcd8cbe..0cb51653e7 100644 --- 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 diff --git a/boards/e104-bt5010a-tb/Makefile.default b/boards/e104-bt5010a-tb/Makefile.default new file mode 100644 index 0000000000..7a4ccee4cb --- /dev/null +++ b/boards/e104-bt5010a-tb/Makefile.default @@ -0,0 +1 @@ +include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default diff --git a/boards/e104-bt5011a-tb/Makefile.default b/boards/e104-bt5011a-tb/Makefile.default new file mode 100644 index 0000000000..7a4ccee4cb --- /dev/null +++ b/boards/e104-bt5011a-tb/Makefile.default @@ -0,0 +1 @@ +include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.default From 2e2dcd5c27bcf5379766070a09c69567b3ceff73 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Sat, 23 Jan 2021 10:11:27 +0100 Subject: [PATCH 4/5] cpu/msp430: move default module to Makefile.default --- cpu/msp430_common/Makefile.default | 2 ++ cpu/msp430_common/Makefile.dep | 3 --- cpu/msp430fxyz/Makefile.default | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 cpu/msp430_common/Makefile.default create mode 100644 cpu/msp430fxyz/Makefile.default diff --git a/cpu/msp430_common/Makefile.default b/cpu/msp430_common/Makefile.default new file mode 100644 index 0000000000..0a5f9cc4c8 --- /dev/null +++ b/cpu/msp430_common/Makefile.default @@ -0,0 +1,2 @@ +# msp430 uses newlib by default +DEFAULT_MODULE += newlib diff --git a/cpu/msp430_common/Makefile.dep b/cpu/msp430_common/Makefile.dep index 54590f7a88..907a9870bc 100644 --- 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 diff --git a/cpu/msp430fxyz/Makefile.default b/cpu/msp430fxyz/Makefile.default new file mode 100644 index 0000000000..72e709ca8f --- /dev/null +++ b/cpu/msp430fxyz/Makefile.default @@ -0,0 +1 @@ +include $(RIOTCPU)/msp430_common/Makefile.default From 91ff4e5ce5217d0c50bb27cf36cdbc3a307357f6 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Sat, 23 Jan 2021 11:14:19 +0100 Subject: [PATCH 5/5] sys/Makefile.dep: default saul_init_devs to y when saul_default is used --- sys/Makefile.dep | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/Makefile.dep b/sys/Makefile.dep index b13c0d6155..8a343cd8a4 100644 --- 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