diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 9782d32446ba58020667652ad3cd084ca46657fd..08c0eefea7ca3f1137ade50161c70ede07a01fcb 100644 --- a/boards/arduino-due/Makefile.include +++ b/boards/arduino-due/Makefile.include @@ -12,6 +12,3 @@ export OFLAGS = -O binary # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial - -# also include optional dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep diff --git a/boards/avsextrem/Makefile.dep b/boards/avsextrem/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..82bd24939dfe1b1ce936cc01f2a8f0dbbcd482ba --- /dev/null +++ b/boards/avsextrem/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/msba2-common/Makefile.dep diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index 303db8c6b5269130f07685b536e571f4e993712a..d1352658650fa87bdc7bf365655fa8ad68a9cd51 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -33,6 +33,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE) export RESET_FLAGS = $(BINDIR) export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb - -# Include board dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include index cd16e056dcbff2343921322a6020ccfb7f6b2d3c..727bd481c6a6d11e1cde19727b954bbcb7ba6e75 100644 --- a/boards/fox/Makefile.include +++ b/boards/fox/Makefile.include @@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial # this board uses openocd include $(RIOTBOARD)/Makefile.include.openocd - -# include board dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include index 1ade26105795f72d32c5349fc50b7e278f7fc9e3..8e063b292efde1f85fe0cbcc58b2d5494822c5c4 100644 --- a/boards/frdm-k64f/Makefile.include +++ b/boards/frdm-k64f/Makefile.include @@ -23,8 +23,6 @@ export OPENOCD_PRE_VERIFY_CMDS += \ export OPENOCD_EXTRA_INIT export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial diff --git a/boards/iotlab-a8-m3/Makefile.include b/boards/iotlab-a8-m3/Makefile.include index 1b7b02f02d6103d6c003d216fa1fcb4329b73932..9bf181cc04afe70e996b0aec8dd52cb4e0a40381 100644 --- a/boards/iotlab-a8-m3/Makefile.include +++ b/boards/iotlab-a8-m3/Makefile.include @@ -1,7 +1,6 @@ USEMODULE += iotlab-common include $(RIOTBOARD)/iotlab-common/Makefile.include -include $(RIOTBOARD)/$(BOARD)/Makefile.dep # add iotlab-a8-m3 include path INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/iotlab-m3/Makefile.dep b/boards/iotlab-m3/Makefile.dep index 4475ce73cc634754078422f7240e39664d861416..87c70c1d6ff346c48a9171066c261d8f5d656205 100644 --- a/boards/iotlab-m3/Makefile.dep +++ b/boards/iotlab-m3/Makefile.dep @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/iotlab-common/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += isl29020 USEMODULE += lps331ap diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include index 0b59abcd7d413d20d1a9bf9184d8ecc2e4dbf6b0..2cf474cce5e522dd989468ae3cee58683de07a81 100644 --- a/boards/iotlab-m3/Makefile.include +++ b/boards/iotlab-m3/Makefile.include @@ -1,7 +1,6 @@ USEMODULE += iotlab-common include $(RIOTBOARD)/iotlab-common/Makefile.include -include $(RIOTBOARD)/$(BOARD)/Makefile.dep # add iotlab-m3 include path INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include index 7f290436118551ad64702f23542741981cd623b2..3c50adb388345192386235556550231d423ccca5 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/msba2-common/Makefile.include @@ -23,7 +23,6 @@ ifeq ($(PORT),) endif export FFLAGS = $(PORT) $(HEXFILE) export TERMFLAGS += -tg -p "$(PORT)" -include $(RIOTBOARD)/msba2-common/Makefile.dep export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include diff --git a/boards/msba2/Makefile.dep b/boards/msba2/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..82bd24939dfe1b1ce936cc01f2a8f0dbbcd482ba --- /dev/null +++ b/boards/msba2/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/msba2-common/Makefile.dep diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index 6408f6195252c7e9c50501d3c7fdf984dc12dc45..67890b37f59698375819af2876e167b7bf1b4192 100644 --- a/boards/mulle/Makefile.include +++ b/boards/mulle/Makefile.include @@ -115,6 +115,3 @@ include $(RIOTBOARD)/Makefile.include.openocd # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial - -# include board dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 2d6ac38eb07276eb52083f70bd817788865beaa1..0dc0182b887552dd3a5565de08abadb7858d6886 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - export NATIVEINCLUDES += -DNATIVE_INCLUDES export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index b2404fafa3fd8952b2cca11684d0ffcacc118e88..fd77b1c892dd5f5cfdb3754e1343d0fa8fe36058 100644 --- a/boards/nrf52dk/Makefile.include +++ b/boards/nrf52dk/Makefile.include @@ -6,9 +6,6 @@ export CPU_MODEL = nrf52xxaa PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup JLink for flashing export JLINK_DEVICE := nrf52 diff --git a/boards/nucleo-common/Makefile.include b/boards/nucleo-common/Makefile.include index dd4c1350dc702415397005fcb9000927d18cfc0d..6f653099fc64ce60d96d51be22ebcbd460a4fd9d 100644 --- a/boards/nucleo-common/Makefile.include +++ b/boards/nucleo-common/Makefile.include @@ -8,8 +8,5 @@ include $(RIOTBOARD)/Makefile.include.serial # this board uses openocd include $(RIOTBOARD)/Makefile.include.openocd -# include dependencies -include $(RIOTBOARD)/nucleo-common/Makefile.dep - # add the common header files to the include path INCLUDES += -I$(RIOTBOARD)/nucleo-common/include diff --git a/boards/nucleo-f072/Makefile.dep b/boards/nucleo-f072/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f072/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f091/Makefile.dep b/boards/nucleo-f091/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f091/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f103/Makefile.dep b/boards/nucleo-f103/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f103/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f207/Makefile.dep b/boards/nucleo-f207/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f207/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f303/Makefile.dep b/boards/nucleo-f303/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f303/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f334/Makefile.dep b/boards/nucleo-f334/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f334/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f401/Makefile.dep b/boards/nucleo-f401/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f401/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/nucleo-f446/Makefile.dep b/boards/nucleo-f446/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..76e2dc17b45c22bfb5b499e63647610ca247b349 --- /dev/null +++ b/boards/nucleo-f446/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/nucleo-common/Makefile.dep diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index ad56683272fc391c3a771bb3d3235a59d32fdb90..f4eb8415a48c78dbd5e0f1223d803beb89243154 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -25,6 +25,3 @@ endif # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial - -# Include board dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index aeba7c17ed2e496c9c72c64f90c0733ca1f3982d..3340ebf4196ba0c549b7e35d36da86ac68b33305 100644 --- a/boards/pba-d-01-kw2x/Makefile.include +++ b/boards/pba-d-01-kw2x/Makefile.include @@ -27,8 +27,6 @@ export OPENOCD_PRE_VERIFY_CMDS += \ export OPENOCD_EXTRA_INIT export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. # Usage: SERIAL="0200..." BOARD="pba-d-01-kw2x" make flash diff --git a/boards/pttu/Makefile.dep b/boards/pttu/Makefile.dep new file mode 100644 index 0000000000000000000000000000000000000000..82bd24939dfe1b1ce936cc01f2a8f0dbbcd482ba --- /dev/null +++ b/boards/pttu/Makefile.dep @@ -0,0 +1 @@ +include $(RIOTBOARD)/msba2-common/Makefile.dep diff --git a/boards/remote-common/Makefile.include b/boards/remote-common/Makefile.include index 7ae0d4cb28eee68729ee21d3898f64cfcf69877a..b6901b8d89dc6f25ef02236371f49d0c692525c1 100644 --- a/boards/remote-common/Makefile.include +++ b/boards/remote-common/Makefile.include @@ -33,6 +33,3 @@ export INCLUDES += -I$(RIOTBOARD)/remote-common/include # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial - -# Include board dependencies -include $(RIOTBOARD)/remote-common/Makefile.dep diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include index 988b77ad764da9b2360fc7aaa94216e905ae6e52..fb6a6119fce8cc6ebe0913c68c2e7667279c2ae8 100644 --- a/boards/saml21-xpro/Makefile.include +++ b/boards/saml21-xpro/Makefile.include @@ -3,9 +3,6 @@ export CPU = saml21 export CPU_MODEL = saml21j18a export CFLAGS += -D__SAML21J18A__ -# include dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup serial terminal PORT_LINUX ?= /dev/ttyACM0 include $(RIOTBOARD)/Makefile.include.serial diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include index b159d90a8a87b5d66ef4cbba952e016b5c5c2cbf..a8da9668c667de0bb3b52bdaee97dcd74b21d308 100644 --- a/boards/samr21-xpro/Makefile.include +++ b/boards/samr21-xpro/Makefile.include @@ -7,9 +7,6 @@ CFLAGS += -D__SAMR21G18A__ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index 3e6a7aac0ef0f7c6b8ff5ac6efea0dd3c7a694b0..991661748adf4128b1d919d64db5d10fb577c9fa 100644 --- a/boards/slwstk6220a/Makefile.include +++ b/boards/slwstk6220a/Makefile.include @@ -6,9 +6,6 @@ export CPU_MODEL = ezr32wg330f256r60 PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup JLink for flashing export JLINK_DEVICE := ezr32wg330f256 include $(RIOTBOARD)/Makefile.include.jlink diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index 71e7292ed9bdf4a789d06d7fbf07a97cc3c83c6f..c84cacd0bd533a50ef9cf2757aa8e047a4e18abc 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -9,9 +9,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*))) export BAUD ?= 9600 include $(RIOTBOARD)/Makefile.include.serial -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # flash tool configuration export OFLAGS = -O ihex export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl diff --git a/boards/waspmote-pro/Makefile.include b/boards/waspmote-pro/Makefile.include index d7c0543274d4eeec71d4dfb6119a189538f6710b..2ba8c80afeb6cee796c100381318563f231af528 100644 --- a/boards/waspmote-pro/Makefile.include +++ b/boards/waspmote-pro/Makefile.include @@ -26,10 +26,6 @@ else # TODO: fix for building under windows endif -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - - export FLASHER export PORT export DIST_PATH = $(RIOTBOARD)/$(BOARD)/dist diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index 4cfb4471768bb7eaf54a42d3286c6826f9826303..fa3dea543cba47481ce1c9fbec6482c659c3d6d4 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -8,9 +8,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal include $(RIOTBOARD)/Makefile.include.serial -# setup the boards dependencies -include $(RIOTBOARD)/$(BOARD)/Makefile.dep - # setup flash tool export OFLAGS = -O ihex export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl