Skip to content
Snippets Groups Projects
Commit 10e9336c authored by Kaspar Schleiser's avatar Kaspar Schleiser
Browse files

boards: adapt to automatically included boards/$board/Makefile.dep

parent f842619f
No related branches found
No related tags found
No related merge requests found
Showing
with 8 additions and 27 deletions
...@@ -12,6 +12,3 @@ export OFLAGS = -O binary ...@@ -12,6 +12,3 @@ export OFLAGS = -O binary
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# also include optional dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/msba2-common/Makefile.dep
...@@ -33,6 +33,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE) ...@@ -33,6 +33,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
export RESET_FLAGS = $(BINDIR) export RESET_FLAGS = $(BINDIR)
export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# Include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
...@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial ...@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
...@@ -23,8 +23,6 @@ export OPENOCD_PRE_VERIFY_CMDS += \ ...@@ -23,8 +23,6 @@ export OPENOCD_PRE_VERIFY_CMDS += \
export OPENOCD_EXTRA_INIT export OPENOCD_EXTRA_INIT
export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
......
USEMODULE += iotlab-common USEMODULE += iotlab-common
include $(RIOTBOARD)/iotlab-common/Makefile.include include $(RIOTBOARD)/iotlab-common/Makefile.include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# add iotlab-a8-m3 include path # add iotlab-a8-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
include $(RIOTBOARD)/iotlab-common/Makefile.dep
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += isl29020 USEMODULE += isl29020
USEMODULE += lps331ap USEMODULE += lps331ap
......
USEMODULE += iotlab-common USEMODULE += iotlab-common
include $(RIOTBOARD)/iotlab-common/Makefile.include include $(RIOTBOARD)/iotlab-common/Makefile.include
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# add iotlab-m3 include path # add iotlab-m3 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
...@@ -23,7 +23,6 @@ ifeq ($(PORT),) ...@@ -23,7 +23,6 @@ ifeq ($(PORT),)
endif endif
export FFLAGS = $(PORT) $(HEXFILE) export FFLAGS = $(PORT) $(HEXFILE)
export TERMFLAGS += -tg -p "$(PORT)" export TERMFLAGS += -tg -p "$(PORT)"
include $(RIOTBOARD)/msba2-common/Makefile.dep
export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
......
include $(RIOTBOARD)/msba2-common/Makefile.dep
...@@ -115,6 +115,3 @@ include $(RIOTBOARD)/Makefile.include.openocd ...@@ -115,6 +115,3 @@ include $(RIOTBOARD)/Makefile.include.openocd
# setup serial terminal # setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial include $(RIOTBOARD)/Makefile.include.serial
# include board dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
export NATIVEINCLUDES += -DNATIVE_INCLUDES export NATIVEINCLUDES += -DNATIVE_INCLUDES
export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
......
...@@ -6,9 +6,6 @@ export CPU_MODEL = nrf52xxaa ...@@ -6,9 +6,6 @@ export CPU_MODEL = nrf52xxaa
PORT_LINUX ?= /dev/ttyACM0 PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup the boards dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := nrf52 export JLINK_DEVICE := nrf52
......
...@@ -8,8 +8,5 @@ include $(RIOTBOARD)/Makefile.include.serial ...@@ -8,8 +8,5 @@ include $(RIOTBOARD)/Makefile.include.serial
# this board uses openocd # this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd include $(RIOTBOARD)/Makefile.include.openocd
# include dependencies
include $(RIOTBOARD)/nucleo-common/Makefile.dep
# add the common header files to the include path # add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/nucleo-common/include INCLUDES += -I$(RIOTBOARD)/nucleo-common/include
include $(RIOTBOARD)/nucleo-common/Makefile.dep
include $(RIOTBOARD)/nucleo-common/Makefile.dep
include $(RIOTBOARD)/nucleo-common/Makefile.dep
include $(RIOTBOARD)/nucleo-common/Makefile.dep
include $(RIOTBOARD)/nucleo-common/Makefile.dep
include $(RIOTBOARD)/nucleo-common/Makefile.dep
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment