diff --git a/boards/airfy-beacon/Makefile.dep b/boards/airfy-beacon/Makefile.dep index babcd96228..8cb9bb2459 100644 --- a/boards/airfy-beacon/Makefile.dep +++ b/boards/airfy-beacon/Makefile.dep @@ -1 +1,4 @@ +# include common nrf51 boards module into the build +USEMODULE += boards_common_nrf51 + include $(RIOTBOARD)/common/nrf51/Makefile.dep diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include index 27f80f29b8..48b693979c 100644 --- a/boards/airfy-beacon/Makefile.include +++ b/boards/airfy-beacon/Makefile.include @@ -1,6 +1,3 @@ -# include common nrf51 boards module into the build -USEMODULE += boards_common_nrf51 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include index 58145a370c..797319f2da 100644 --- a/boards/arduino-mega2560/Makefile.include +++ b/boards/arduino-mega2560/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_arduino-atmega - # configure the terminal program PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) diff --git a/boards/arduino-mkr1000/Makefile.dep b/boards/arduino-mkr1000/Makefile.dep index 698c09c572..4bcbbbc170 100644 --- a/boards/arduino-mkr1000/Makefile.dep +++ b/boards/arduino-mkr1000/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_arduino-mkr + include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep diff --git a/boards/arduino-mkr1000/Makefile.include b/boards/arduino-mkr1000/Makefile.include index 1183d0a3dc..480a643165 100644 --- a/boards/arduino-mkr1000/Makefile.include +++ b/boards/arduino-mkr1000/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_arduino-mkr - ifeq ($(PROGRAMMER),jlink) export MKR_JLINK_DEVICE = atsamw25 endif diff --git a/boards/arduino-mkrfox1200/Makefile.dep b/boards/arduino-mkrfox1200/Makefile.dep index 698c09c572..4bcbbbc170 100644 --- a/boards/arduino-mkrfox1200/Makefile.dep +++ b/boards/arduino-mkrfox1200/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_arduino-mkr + include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep diff --git a/boards/arduino-mkrfox1200/Makefile.include b/boards/arduino-mkrfox1200/Makefile.include index 8c5a271f09..f4b6f8e18d 100644 --- a/boards/arduino-mkrfox1200/Makefile.include +++ b/boards/arduino-mkrfox1200/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_arduino-mkr - ifeq ($(PROGRAMMER),jlink) export MKR_JLINK_DEVICE = atsamd21 endif diff --git a/boards/arduino-mkrwan1300/Makefile.dep b/boards/arduino-mkrwan1300/Makefile.dep index 698c09c572..4bcbbbc170 100644 --- a/boards/arduino-mkrwan1300/Makefile.dep +++ b/boards/arduino-mkrwan1300/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_arduino-mkr + include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep diff --git a/boards/arduino-mkrwan1300/Makefile.include b/boards/arduino-mkrwan1300/Makefile.include index ab074eb66e..b131e8d21a 100644 --- a/boards/arduino-mkrwan1300/Makefile.include +++ b/boards/arduino-mkrwan1300/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_arduino-mkr - ifeq ($(PROGRAMMER),jlink) export MKR_JLINK_DEVICE = atsamd21 endif diff --git a/boards/arduino-mkrzero/Makefile.dep b/boards/arduino-mkrzero/Makefile.dep index 698c09c572..4bcbbbc170 100644 --- a/boards/arduino-mkrzero/Makefile.dep +++ b/boards/arduino-mkrzero/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_arduino-mkr + include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep diff --git a/boards/arduino-mkrzero/Makefile.include b/boards/arduino-mkrzero/Makefile.include index 8c5a271f09..f4b6f8e18d 100644 --- a/boards/arduino-mkrzero/Makefile.include +++ b/boards/arduino-mkrzero/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_arduino-mkr - ifeq ($(PROGRAMMER),jlink) export MKR_JLINK_DEVICE = atsamd21 endif diff --git a/boards/blackpill-128kib/Makefile.dep b/boards/blackpill-128kib/Makefile.dep index a3e195bcc2..a15ea55fa4 100644 --- a/boards/blackpill-128kib/Makefile.dep +++ b/boards/blackpill-128kib/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_blxxxpill + include $(RIOTBOARD)/common/blxxxpill/Makefile.dep diff --git a/boards/blackpill-128kib/Makefile.include b/boards/blackpill-128kib/Makefile.include index 63221c6783..55be113c8b 100644 --- a/boards/blackpill-128kib/Makefile.include +++ b/boards/blackpill-128kib/Makefile.include @@ -1,5 +1,3 @@ export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg -USEMODULE += boards_common_blxxxpill - include $(RIOTBOARD)/common/blxxxpill/Makefile.include diff --git a/boards/blackpill/Makefile.dep b/boards/blackpill/Makefile.dep index a3e195bcc2..a15ea55fa4 100644 --- a/boards/blackpill/Makefile.dep +++ b/boards/blackpill/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_blxxxpill + include $(RIOTBOARD)/common/blxxxpill/Makefile.dep diff --git a/boards/blackpill/Makefile.include b/boards/blackpill/Makefile.include index bfb8dd58e0..e502f5c2a1 100644 --- a/boards/blackpill/Makefile.include +++ b/boards/blackpill/Makefile.include @@ -1,5 +1,3 @@ export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg -USEMODULE += boards_common_blxxxpill - include $(RIOTBOARD)/common/blxxxpill/Makefile.include diff --git a/boards/bluepill-128kib/Makefile.dep b/boards/bluepill-128kib/Makefile.dep index a3e195bcc2..a15ea55fa4 100644 --- a/boards/bluepill-128kib/Makefile.dep +++ b/boards/bluepill-128kib/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_blxxxpill + include $(RIOTBOARD)/common/blxxxpill/Makefile.dep diff --git a/boards/bluepill-128kib/Makefile.include b/boards/bluepill-128kib/Makefile.include index 63221c6783..55be113c8b 100644 --- a/boards/bluepill-128kib/Makefile.include +++ b/boards/bluepill-128kib/Makefile.include @@ -1,5 +1,3 @@ export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd-128kib.cfg -USEMODULE += boards_common_blxxxpill - include $(RIOTBOARD)/common/blxxxpill/Makefile.include diff --git a/boards/bluepill/Makefile.dep b/boards/bluepill/Makefile.dep index a3e195bcc2..a15ea55fa4 100644 --- a/boards/bluepill/Makefile.dep +++ b/boards/bluepill/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_blxxxpill + include $(RIOTBOARD)/common/blxxxpill/Makefile.dep diff --git a/boards/bluepill/Makefile.include b/boards/bluepill/Makefile.include index bfb8dd58e0..e502f5c2a1 100644 --- a/boards/bluepill/Makefile.include +++ b/boards/bluepill/Makefile.include @@ -1,5 +1,3 @@ export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/blxxxpill/dist/openocd.cfg -USEMODULE += boards_common_blxxxpill - include $(RIOTBOARD)/common/blxxxpill/Makefile.include diff --git a/boards/chronos/Makefile.dep b/boards/chronos/Makefile.dep new file mode 100644 index 0000000000..4e4bb9237d --- /dev/null +++ b/boards/chronos/Makefile.dep @@ -0,0 +1 @@ +USEMODULE += chronos-drivers diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index 932f3f7be3..7f8e817e25 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -4,5 +4,3 @@ FLASHER = mspdebug FFLAGS = rf2500 "prog $(FLASHFILE)" INCLUDES += -I$(RIOTBOARD)/chronos/drivers/include - -USEMODULE += chronos-drivers diff --git a/boards/common/arduino-due/Makefile.dep b/boards/common/arduino-due/Makefile.dep index 5472bf8b8d..52b20c17ad 100644 --- a/boards/common/arduino-due/Makefile.dep +++ b/boards/common/arduino-due/Makefile.dep @@ -1,3 +1,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_arduino_due diff --git a/boards/common/arduino-due/Makefile.include b/boards/common/arduino-due/Makefile.include index 81847a8d17..19bf09eebc 100644 --- a/boards/common/arduino-due/Makefile.include +++ b/boards/common/arduino-due/Makefile.include @@ -1,5 +1,4 @@ # export this module and its includes -USEMODULE += boards_common_arduino_due INCLUDES += -I$(RIOTBOARD)/common/arduino-due/include # define the default port depending on the host OS diff --git a/boards/common/nrf52xxxdk/Makefile.include b/boards/common/nrf52xxxdk/Makefile.include index 681009d0bc..b5e9616fa0 100644 --- a/boards/common/nrf52xxxdk/Makefile.include +++ b/boards/common/nrf52xxxdk/Makefile.include @@ -1,6 +1,5 @@ # include this module into the build INCLUDES += -I$(RIOTBOARD)/common/nrf52xxxdk/include -USEMODULE += boards_common_nrf52xxdk # include common configuration for nrf52 based boards include $(RIOTBOARD)/common/nrf52/Makefile.include diff --git a/boards/common/nucleo/Makefile.dep b/boards/common/nucleo/Makefile.dep index 5472bf8b8d..ce19b84383 100644 --- a/boards/common/nucleo/Makefile.dep +++ b/boards/common/nucleo/Makefile.dep @@ -1,3 +1,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_nucleo diff --git a/boards/common/nucleo/Makefile.include b/boards/common/nucleo/Makefile.include index 06c88290c5..eeed8f95d8 100644 --- a/boards/common/nucleo/Makefile.include +++ b/boards/common/nucleo/Makefile.include @@ -1,5 +1,4 @@ # export this module and its includes -USEMODULE += boards_common_nucleo INCLUDES += -I$(RIOTBOARD)/common/nucleo/include # we use shared STM32 configuration snippets diff --git a/boards/common/saml1x/Makefile.dep b/boards/common/saml1x/Makefile.dep index 5472bf8b8d..28047d9ff5 100644 --- a/boards/common/saml1x/Makefile.dep +++ b/boards/common/saml1x/Makefile.dep @@ -1,3 +1,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_saml1x diff --git a/boards/common/saml1x/Makefile.include b/boards/common/saml1x/Makefile.include index e56e61942c..b4042c2ecc 100644 --- a/boards/common/saml1x/Makefile.include +++ b/boards/common/saml1x/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_saml1x - include $(RIOTMAKE)/boards/sam0.inc.mk # add the common header files to the include path diff --git a/boards/common/slwstk6000b/Makefile.dep b/boards/common/slwstk6000b/Makefile.dep index e92caacf7f..eb037e2587 100644 --- a/boards/common/slwstk6000b/Makefile.dep +++ b/boards/common/slwstk6000b/Makefile.dep @@ -3,5 +3,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += si7021 endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_aem +USEMODULE += silabs_bc + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/common/slwstk6000b/Makefile.include b/boards/common/slwstk6000b/Makefile.include index e511c7de3c..794400d9ec 100644 --- a/boards/common/slwstk6000b/Makefile.include +++ b/boards/common/slwstk6000b/Makefile.include @@ -15,10 +15,5 @@ include $(RIOTMAKE)/tools/serial.inc.mk export JLINK_DEVICE := $(MODULE_JLINK_DEVICE) include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_aem -USEMODULE += silabs_bc - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/common/wsn430/Makefile.dep b/boards/common/wsn430/Makefile.dep new file mode 100644 index 0000000000..05e6908c86 --- /dev/null +++ b/boards/common/wsn430/Makefile.dep @@ -0,0 +1,2 @@ +# include this module in the build +USEMODULE += boards_common_wsn430 diff --git a/boards/common/wsn430/Makefile.include b/boards/common/wsn430/Makefile.include index d31ac368ad..afa4e77d43 100644 --- a/boards/common/wsn430/Makefile.include +++ b/boards/common/wsn430/Makefile.include @@ -1,5 +1,3 @@ -# include this module in the build -USEMODULE += boards_common_wsn430 # use common wsn430 includes INCLUDES += -I$(RIOTBOARD)/common/wsn430/include diff --git a/boards/esp32-mh-et-live-minikit/Makefile.dep b/boards/esp32-mh-et-live-minikit/Makefile.dep index 29d6c99ba8..f19c2c1a36 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile.dep +++ b/boards/esp32-mh-et-live-minikit/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_esp32 + include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-mh-et-live-minikit/Makefile.include b/boards/esp32-mh-et-live-minikit/Makefile.include index ccb56a010d..30a3389a47 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile.include +++ b/boards/esp32-mh-et-live-minikit/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-ttgo-t-beam/Makefile.dep b/boards/esp32-ttgo-t-beam/Makefile.dep index 6c6d30e82b..53b4915969 100644 --- a/boards/esp32-ttgo-t-beam/Makefile.dep +++ b/boards/esp32-ttgo-t-beam/Makefile.dep @@ -2,4 +2,6 @@ ifneq (,$(filter esp32_ttgo_t_beam_v1_0,$(USEMODULE))) FEATURES_REQUIRED += periph_i2c endif +USEMODULE += boards_common_esp32 + include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-ttgo-t-beam/Makefile.include b/boards/esp32-ttgo-t-beam/Makefile.include index 0fa58881ea..1c6db773f3 100644 --- a/boards/esp32-ttgo-t-beam/Makefile.include +++ b/boards/esp32-ttgo-t-beam/Makefile.include @@ -1,5 +1,3 @@ PSEUDOMODULES += esp32_ttgo_t_beam_v1_0 -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep index 29d6c99ba8..d8a584436c 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep @@ -1 +1,4 @@ +USEMODULE += boards_common_esp32 +USEMODULE += esp_spi_ram + include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.include b/boards/esp32-wemos-lolin-d32-pro/Makefile.include index 3df3e4a4d5..782a1579a8 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.include +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.include @@ -1,6 +1,3 @@ PSEUDOMODULES += esp_lolin_tft -USEMODULE += boards_common_esp32 -USEMODULE += esp_spi_ram - include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-wroom-32/Makefile.dep b/boards/esp32-wroom-32/Makefile.dep index bc22041b98..1fd5b11c92 100644 --- a/boards/esp32-wroom-32/Makefile.dep +++ b/boards/esp32-wroom-32/Makefile.dep @@ -1,3 +1,5 @@ +USEMODULE += boards_common_esp32 + include $(RIOTBOARD)/common/esp32/Makefile.dep # default parameter definitions when module enc28j60 is used diff --git a/boards/esp32-wroom-32/Makefile.include b/boards/esp32-wroom-32/Makefile.include index ccb56a010d..30a3389a47 100644 --- a/boards/esp32-wroom-32/Makefile.include +++ b/boards/esp32-wroom-32/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep index 29d6c99ba8..f19c2c1a36 100644 --- a/boards/esp32-wrover-kit/Makefile.dep +++ b/boards/esp32-wrover-kit/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_esp32 + include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-wrover-kit/Makefile.include b/boards/esp32-wrover-kit/Makefile.include index a5c6f2a3d5..9adf2f209b 100644 --- a/boards/esp32-wrover-kit/Makefile.include +++ b/boards/esp32-wrover-kit/Makefile.include @@ -1,7 +1,5 @@ PSEUDOMODULES += esp32_wrover_kit_camera -USEMODULE += boards_common_esp32 - # configure the serial interface PORT_LINUX ?= /dev/ttyUSB1 diff --git a/boards/esp8266-esp-12x/Makefile.dep b/boards/esp8266-esp-12x/Makefile.dep index c60e4b8da1..c87ee73360 100644 --- a/boards/esp8266-esp-12x/Makefile.dep +++ b/boards/esp8266-esp-12x/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_esp8266 + include $(RIOTBOARD)/common/esp8266/Makefile.dep diff --git a/boards/esp8266-esp-12x/Makefile.include b/boards/esp8266-esp-12x/Makefile.include index fec74c6f68..1ee2600134 100644 --- a/boards/esp8266-esp-12x/Makefile.include +++ b/boards/esp8266-esp-12x/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_esp8266 - include $(RIOTBOARD)/common/esp8266/Makefile.include diff --git a/boards/esp8266-olimex-mod/Makefile.dep b/boards/esp8266-olimex-mod/Makefile.dep index c60e4b8da1..c87ee73360 100644 --- a/boards/esp8266-olimex-mod/Makefile.dep +++ b/boards/esp8266-olimex-mod/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_esp8266 + include $(RIOTBOARD)/common/esp8266/Makefile.dep diff --git a/boards/esp8266-olimex-mod/Makefile.include b/boards/esp8266-olimex-mod/Makefile.include index fec74c6f68..1ee2600134 100644 --- a/boards/esp8266-olimex-mod/Makefile.include +++ b/boards/esp8266-olimex-mod/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_esp8266 - include $(RIOTBOARD)/common/esp8266/Makefile.include diff --git a/boards/esp8266-sparkfun-thing/Makefile.dep b/boards/esp8266-sparkfun-thing/Makefile.dep index c60e4b8da1..c87ee73360 100644 --- a/boards/esp8266-sparkfun-thing/Makefile.dep +++ b/boards/esp8266-sparkfun-thing/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_esp8266 + include $(RIOTBOARD)/common/esp8266/Makefile.dep diff --git a/boards/esp8266-sparkfun-thing/Makefile.include b/boards/esp8266-sparkfun-thing/Makefile.include index fec74c6f68..1ee2600134 100644 --- a/boards/esp8266-sparkfun-thing/Makefile.include +++ b/boards/esp8266-sparkfun-thing/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_esp8266 - include $(RIOTBOARD)/common/esp8266/Makefile.include diff --git a/boards/firefly/Makefile.dep b/boards/firefly/Makefile.dep index d377b9a29a..c2635c1556 100644 --- a/boards/firefly/Makefile.dep +++ b/boards/firefly/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_remote + include $(RIOTBOARD)/common/remote/Makefile.dep diff --git a/boards/firefly/Makefile.include b/boards/firefly/Makefile.include index e51969d49a..7087fe8f5e 100644 --- a/boards/firefly/Makefile.include +++ b/boards/firefly/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_remote - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/frdm-kw41z/Makefile.dep b/boards/frdm-kw41z/Makefile.dep index 519d065d00..549e8dc414 100644 --- a/boards/frdm-kw41z/Makefile.dep +++ b/boards/frdm-kw41z/Makefile.dep @@ -2,4 +2,7 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += fxos8700 endif +# This board uses the shared board_init function +USEMODULE += boards_common_kw41z + include $(RIOTBOARD)/common/kw41z/Makefile.dep diff --git a/boards/frdm-kw41z/Makefile.include b/boards/frdm-kw41z/Makefile.include index 67c0562790..50f356ef7d 100644 --- a/boards/frdm-kw41z/Makefile.include +++ b/boards/frdm-kw41z/Makefile.include @@ -1,4 +1 @@ -# This board uses the shared board_init function -USEMODULE += boards_common_kw41z - include $(RIOTBOARD)/common/kw41z/Makefile.include diff --git a/boards/iotlab-a8-m3/Makefile.dep b/boards/iotlab-a8-m3/Makefile.dep index a8b46ed78f..205542035d 100644 --- a/boards/iotlab-a8-m3/Makefile.dep +++ b/boards/iotlab-a8-m3/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_iotlab + include $(RIOTBOARD)/common/iotlab/Makefile.dep diff --git a/boards/iotlab-a8-m3/Makefile.include b/boards/iotlab-a8-m3/Makefile.include index d54c70cfc5..ab4243f7ef 100644 --- a/boards/iotlab-a8-m3/Makefile.include +++ b/boards/iotlab-a8-m3/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_iotlab - include $(RIOTBOARD)/common/iotlab/Makefile.include diff --git a/boards/iotlab-m3/Makefile.dep b/boards/iotlab-m3/Makefile.dep index bb828bd706..285a7dbeff 100644 --- a/boards/iotlab-m3/Makefile.dep +++ b/boards/iotlab-m3/Makefile.dep @@ -4,3 +4,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += isl29020 USEMODULE += lps331ap endif + +USEMODULE += boards_common_iotlab diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include index d54c70cfc5..ab4243f7ef 100644 --- a/boards/iotlab-m3/Makefile.include +++ b/boards/iotlab-m3/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_iotlab - include $(RIOTBOARD)/common/iotlab/Makefile.include diff --git a/boards/msb-430/Makefile.dep b/boards/msb-430/Makefile.dep index f512457554..79312a58ae 100644 --- a/boards/msb-430/Makefile.dep +++ b/boards/msb-430/Makefile.dep @@ -1,3 +1,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += sht11 endif + +USEMODULE += boards_common_msb-430 diff --git a/boards/msb-430/Makefile.include b/boards/msb-430/Makefile.include index 92d0ca027f..a27982b469 100644 --- a/boards/msb-430/Makefile.include +++ b/boards/msb-430/Makefile.include @@ -1,2 +1 @@ -USEMODULE += boards_common_msb-430 include $(RIOTBOARD)/common/msb-430/Makefile.include diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep index f512457554..79312a58ae 100644 --- a/boards/msb-430h/Makefile.dep +++ b/boards/msb-430h/Makefile.dep @@ -1,3 +1,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += sht11 endif + +USEMODULE += boards_common_msb-430 diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include index 92d0ca027f..a27982b469 100644 --- a/boards/msb-430h/Makefile.include +++ b/boards/msb-430h/Makefile.include @@ -1,2 +1 @@ -USEMODULE += boards_common_msb-430 include $(RIOTBOARD)/common/msb-430/Makefile.include diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep index fb4182b31a..d93e7ece44 100644 --- a/boards/native/Makefile.dep +++ b/boards/native/Makefile.dep @@ -19,3 +19,5 @@ ifneq (,$(filter socket_zep,$(USEMODULE))) USEMODULE += checksum USEMODULE += random endif + +USEMODULE += native-drivers diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 4fb53c375f..f5a75e4885 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -3,8 +3,6 @@ export NATIVEINCLUDES += -I$(RIOTBOARD)/native/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ -USEMODULE += native-drivers - ifeq ($(OS),Darwin) DEBUGGER ?= lldb else diff --git a/boards/nrf52840dk/Makefile.dep b/boards/nrf52840dk/Makefile.dep index 68628f406a..ba4cc9e45c 100644 --- a/boards/nrf52840dk/Makefile.dep +++ b/boards/nrf52840dk/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_nrf52xxdk + include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep diff --git a/boards/nrf52dk/Makefile.dep b/boards/nrf52dk/Makefile.dep index 68628f406a..ba4cc9e45c 100644 --- a/boards/nrf52dk/Makefile.dep +++ b/boards/nrf52dk/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_nrf52xxdk + include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep diff --git a/boards/particle-argon/Makefile.dep b/boards/particle-argon/Makefile.dep index a568b57f20..3c6f812471 100644 --- a/boards/particle-argon/Makefile.dep +++ b/boards/particle-argon/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_particle_mesh + include $(RIOTBOARD)/common/particle-mesh/Makefile.dep diff --git a/boards/particle-argon/Makefile.include b/boards/particle-argon/Makefile.include index 178b7f036f..9a16211c41 100644 --- a/boards/particle-argon/Makefile.include +++ b/boards/particle-argon/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_particle_mesh - include $(RIOTBOARD)/common/particle-mesh/Makefile.include diff --git a/boards/particle-boron/Makefile.dep b/boards/particle-boron/Makefile.dep index a568b57f20..3c6f812471 100644 --- a/boards/particle-boron/Makefile.dep +++ b/boards/particle-boron/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_particle_mesh + include $(RIOTBOARD)/common/particle-mesh/Makefile.dep diff --git a/boards/particle-boron/Makefile.include b/boards/particle-boron/Makefile.include index 178b7f036f..9a16211c41 100644 --- a/boards/particle-boron/Makefile.include +++ b/boards/particle-boron/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_particle_mesh - include $(RIOTBOARD)/common/particle-mesh/Makefile.include diff --git a/boards/particle-xenon/Makefile.dep b/boards/particle-xenon/Makefile.dep index a568b57f20..3c6f812471 100644 --- a/boards/particle-xenon/Makefile.dep +++ b/boards/particle-xenon/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_particle_mesh + include $(RIOTBOARD)/common/particle-mesh/Makefile.dep diff --git a/boards/particle-xenon/Makefile.include b/boards/particle-xenon/Makefile.include index 178b7f036f..9a16211c41 100644 --- a/boards/particle-xenon/Makefile.include +++ b/boards/particle-xenon/Makefile.include @@ -1,3 +1 @@ -USEMODULE += boards_common_particle_mesh - include $(RIOTBOARD)/common/particle-mesh/Makefile.include diff --git a/boards/remote-pa/Makefile.dep b/boards/remote-pa/Makefile.dep index d377b9a29a..c2635c1556 100644 --- a/boards/remote-pa/Makefile.dep +++ b/boards/remote-pa/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_remote + include $(RIOTBOARD)/common/remote/Makefile.dep diff --git a/boards/remote-pa/Makefile.include b/boards/remote-pa/Makefile.include index 31ec1637b2..0e220d7bd9 100644 --- a/boards/remote-pa/Makefile.include +++ b/boards/remote-pa/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_remote - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB1 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) diff --git a/boards/remote-reva/Makefile.dep b/boards/remote-reva/Makefile.dep index d377b9a29a..c2635c1556 100644 --- a/boards/remote-reva/Makefile.dep +++ b/boards/remote-reva/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_remote + include $(RIOTBOARD)/common/remote/Makefile.dep diff --git a/boards/remote-reva/Makefile.include b/boards/remote-reva/Makefile.include index e51969d49a..7087fe8f5e 100644 --- a/boards/remote-reva/Makefile.include +++ b/boards/remote-reva/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_remote - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/remote-revb/Makefile.dep b/boards/remote-revb/Makefile.dep index d377b9a29a..c2635c1556 100644 --- a/boards/remote-revb/Makefile.dep +++ b/boards/remote-revb/Makefile.dep @@ -1 +1,3 @@ +USEMODULE += boards_common_remote + include $(RIOTBOARD)/common/remote/Makefile.dep diff --git a/boards/remote-revb/Makefile.include b/boards/remote-revb/Makefile.include index e51969d49a..7087fe8f5e 100644 --- a/boards/remote-revb/Makefile.include +++ b/boards/remote-revb/Makefile.include @@ -1,5 +1,3 @@ -USEMODULE += boards_common_remote - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) diff --git a/boards/ruuvitag/Makefile.dep b/boards/ruuvitag/Makefile.dep index 5a8a397363..5040311824 100644 --- a/boards/ruuvitag/Makefile.dep +++ b/boards/ruuvitag/Makefile.dep @@ -7,4 +7,6 @@ endif # Use Segger's RTT by default for stdio on this board DEFAULT_MODULE += stdio_rtt +USEMODULE += boards_common_nrf52xxdk + include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/slstk3401a/Makefile.dep b/boards/slstk3401a/Makefile.dep index e92caacf7f..eb037e2587 100644 --- a/boards/slstk3401a/Makefile.dep +++ b/boards/slstk3401a/Makefile.dep @@ -3,5 +3,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += si7021 endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_aem +USEMODULE += silabs_bc + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/slstk3401a/Makefile.include b/boards/slstk3401a/Makefile.include index 55d8eaef3b..8b4181a33d 100644 --- a/boards/slstk3401a/Makefile.include +++ b/boards/slstk3401a/Makefile.include @@ -10,10 +10,5 @@ export JLINK_DEVICE := $(CPU_MODEL) export JLINK_PRE_FLASH = r include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_aem -USEMODULE += silabs_bc - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/slstk3402a/Makefile.dep b/boards/slstk3402a/Makefile.dep index e92caacf7f..eb037e2587 100644 --- a/boards/slstk3402a/Makefile.dep +++ b/boards/slstk3402a/Makefile.dep @@ -3,5 +3,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += si7021 endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_aem +USEMODULE += silabs_bc + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/slstk3402a/Makefile.include b/boards/slstk3402a/Makefile.include index 55d8eaef3b..8b4181a33d 100644 --- a/boards/slstk3402a/Makefile.include +++ b/boards/slstk3402a/Makefile.include @@ -10,10 +10,5 @@ export JLINK_DEVICE := $(CPU_MODEL) export JLINK_PRE_FLASH = r include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_aem -USEMODULE += silabs_bc - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/sltb001a/Makefile.dep b/boards/sltb001a/Makefile.dep index a41f954fb4..375d266294 100644 --- a/boards/sltb001a/Makefile.dep +++ b/boards/sltb001a/Makefile.dep @@ -4,5 +4,9 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += si7021 endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_pic + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/sltb001a/Makefile.include b/boards/sltb001a/Makefile.include index 1e47fe61cb..7b2297b56e 100644 --- a/boards/sltb001a/Makefile.include +++ b/boards/sltb001a/Makefile.include @@ -10,9 +10,5 @@ export JLINK_DEVICE := EFR32MG1PxxxF256 export JLINK_PRE_FLASH = r include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_pic - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/stk3600/Makefile.dep b/boards/stk3600/Makefile.dep index b271afb938..2a588f2abd 100644 --- a/boards/stk3600/Makefile.dep +++ b/boards/stk3600/Makefile.dep @@ -2,5 +2,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_aem +USEMODULE += silabs_bc + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/stk3600/Makefile.include b/boards/stk3600/Makefile.include index 260acdf982..4919d97c80 100644 --- a/boards/stk3600/Makefile.include +++ b/boards/stk3600/Makefile.include @@ -9,10 +9,5 @@ include $(RIOTMAKE)/tools/serial.inc.mk export JLINK_DEVICE := $(CPU_MODEL) include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_aem -USEMODULE += silabs_bc - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/stk3700/Makefile.dep b/boards/stk3700/Makefile.dep index b271afb938..2a588f2abd 100644 --- a/boards/stk3700/Makefile.dep +++ b/boards/stk3700/Makefile.dep @@ -2,5 +2,10 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif +# add board common drivers +USEMODULE += boards_common_silabs +USEMODULE += silabs_aem +USEMODULE += silabs_bc + # include board common dependencies include $(RIOTBOARD)/common/silabs/Makefile.dep diff --git a/boards/stk3700/Makefile.include b/boards/stk3700/Makefile.include index 260acdf982..4919d97c80 100644 --- a/boards/stk3700/Makefile.include +++ b/boards/stk3700/Makefile.include @@ -9,10 +9,5 @@ include $(RIOTMAKE)/tools/serial.inc.mk export JLINK_DEVICE := $(CPU_MODEL) include $(RIOTMAKE)/tools/jlink.inc.mk -# add board common drivers -USEMODULE += boards_common_silabs -USEMODULE += silabs_aem -USEMODULE += silabs_bc - # include board common include $(RIOTBOARD)/common/silabs/Makefile.include diff --git a/boards/stm32f723e-disco/Makefile.dep b/boards/stm32f723e-disco/Makefile.dep index a7445980ad..20970f7ea1 100644 --- a/boards/stm32f723e-disco/Makefile.dep +++ b/boards/stm32f723e-disco/Makefile.dep @@ -3,3 +3,6 @@ USEMODULE += stm32_periph_uart_hw_fc ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +# TODO: remove the stdin dependency +USEMODULE += stdin diff --git a/boards/stm32f723e-disco/Makefile.include b/boards/stm32f723e-disco/Makefile.include index 75abab121a..1c1c84ed83 100644 --- a/boards/stm32f723e-disco/Makefile.include +++ b/boards/stm32f723e-disco/Makefile.include @@ -11,8 +11,5 @@ include $(RIOTMAKE)/tools/serial.inc.mk # this board has an on-board ST-link adapter DEBUG_ADAPTER ?= stlink -# TODO: remove the stdin dependency -USEMODULE += stdin - # this board uses openocd include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/usb-kw41z/Makefile.dep b/boards/usb-kw41z/Makefile.dep index 0614b8c8cb..a75426e9db 100644 --- a/boards/usb-kw41z/Makefile.dep +++ b/boards/usb-kw41z/Makefile.dep @@ -1 +1,4 @@ +# This board uses the shared board_init function +USEMODULE += boards_common_kw41z + include $(RIOTBOARD)/common/kw41z/Makefile.dep diff --git a/boards/usb-kw41z/Makefile.include b/boards/usb-kw41z/Makefile.include index 67c0562790..50f356ef7d 100644 --- a/boards/usb-kw41z/Makefile.include +++ b/boards/usb-kw41z/Makefile.include @@ -1,4 +1 @@ -# This board uses the shared board_init function -USEMODULE += boards_common_kw41z - include $(RIOTBOARD)/common/kw41z/Makefile.include diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep new file mode 100644 index 0000000000..47da349b22 --- /dev/null +++ b/boards/wsn430-v1_3b/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/common/wsn430/Makefile.dep diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep new file mode 100644 index 0000000000..47da349b22 --- /dev/null +++ b/boards/wsn430-v1_4/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/common/wsn430/Makefile.dep diff --git a/boards/yunjia-nrf51822/Makefile.dep b/boards/yunjia-nrf51822/Makefile.dep index babcd96228..8cb9bb2459 100644 --- a/boards/yunjia-nrf51822/Makefile.dep +++ b/boards/yunjia-nrf51822/Makefile.dep @@ -1 +1,4 @@ +# include common nrf51 boards module into the build +USEMODULE += boards_common_nrf51 + include $(RIOTBOARD)/common/nrf51/Makefile.dep diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include index 4bed65978e..4d2684bf13 100644 --- a/boards/yunjia-nrf51822/Makefile.include +++ b/boards/yunjia-nrf51822/Makefile.include @@ -1,6 +1,3 @@ -# include common nrf51 boards module into the build -USEMODULE += boards_common_nrf51 - # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))