From 10e9336c78d92b9ce3648933cbfb419dd537d314 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser <kaspar@schleiser.de> Date: Thu, 29 Sep 2016 15:14:42 +0200 Subject: [PATCH] boards: adapt to automatically included boards/$board/Makefile.dep --- boards/arduino-due/Makefile.include | 3 --- boards/avsextrem/Makefile.dep | 1 + boards/cc2538dk/Makefile.include | 3 --- boards/fox/Makefile.include | 3 --- boards/frdm-k64f/Makefile.include | 2 -- boards/iotlab-a8-m3/Makefile.include | 1 - boards/iotlab-m3/Makefile.dep | 2 -- boards/iotlab-m3/Makefile.include | 1 - boards/msba2-common/Makefile.include | 1 - boards/msba2/Makefile.dep | 1 + boards/mulle/Makefile.include | 3 --- boards/native/Makefile.include | 2 -- boards/nrf52dk/Makefile.include | 3 --- boards/nucleo-common/Makefile.include | 3 --- boards/nucleo-f072/Makefile.dep | 1 + boards/nucleo-f091/Makefile.dep | 1 + boards/nucleo-f103/Makefile.dep | 1 + boards/nucleo-f207/Makefile.dep | 1 + boards/nucleo-f303/Makefile.dep | 1 + boards/nucleo-f334/Makefile.dep | 1 + boards/nucleo-f401/Makefile.dep | 1 + boards/nucleo-f446/Makefile.dep | 1 + boards/openmote-cc2538/Makefile.include | 3 --- boards/pba-d-01-kw2x/Makefile.include | 2 -- boards/pttu/Makefile.dep | 1 + boards/remote-common/Makefile.include | 3 --- boards/saml21-xpro/Makefile.include | 3 --- boards/samr21-xpro/Makefile.include | 3 --- boards/slwstk6220a/Makefile.include | 3 --- boards/telosb/Makefile.include | 3 --- boards/waspmote-pro/Makefile.include | 4 ---- boards/z1/Makefile.include | 3 --- 32 files changed, 11 insertions(+), 54 deletions(-) create mode 100644 boards/avsextrem/Makefile.dep create mode 100644 boards/msba2/Makefile.dep create mode 100644 boards/nucleo-f072/Makefile.dep create mode 100644 boards/nucleo-f091/Makefile.dep create mode 100644 boards/nucleo-f103/Makefile.dep create mode 100644 boards/nucleo-f207/Makefile.dep create mode 100644 boards/nucleo-f303/Makefile.dep create mode 100644 boards/nucleo-f334/Makefile.dep create mode 100644 boards/nucleo-f401/Makefile.dep create mode 100644 boards/nucleo-f446/Makefile.dep create mode 100644 boards/pttu/Makefile.dep diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 9782d32446..08c0eefea7 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 0000000000..82bd24939d --- /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 303db8c6b5..d135265865 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 cd16e056dc..727bd481c6 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 1ade261057..8e063b292e 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 1b7b02f02d..9bf181cc04 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 4475ce73cc..87c70c1d6f 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 0b59abcd7d..2cf474cce5 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 7f29043611..3c50adb388 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 0000000000..82bd24939d --- /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 6408f61952..67890b37f5 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 2d6ac38eb0..0dc0182b88 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 b2404fafa3..fd77b1c892 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 dd4c1350dc..6f653099fc 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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 0000000000..76e2dc17b4 --- /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 ad56683272..f4eb8415a4 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 aeba7c17ed..3340ebf419 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 0000000000..82bd24939d --- /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 7ae0d4cb28..b6901b8d89 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 988b77ad76..fb6a6119fc 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 b159d90a8a..a8da9668c6 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 3e6a7aac0e..991661748a 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 71e7292ed9..c84cacd0bd 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 d7c0543274..2ba8c80afe 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 4cfb447176..fa3dea543c 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 -- GitLab