riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards: replace use of $(BOARD) by explicit name

Browse Source 
With the introduction of BOARDSDIR external boards can re-use common
code of BOARDS present in RIOTBASE. To be able to do this file
references may not use $(BOARD) since BOARD will be set by the
external BOARD.
This commit is contained in:
Francisco Molina 2019-12-20 18:36:34 +01:00
parent 8416974b3c
commit 5a8f996111
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/arduino-mkrwan1300/Makefile.include
View File

@ -7,4 +7,4 @@ endif
include $(RIOTBOARD)/common/arduino-mkr/Makefile.include include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
# add arduino-mkrwan1300 include path # add arduino-mkrwan1300 include path
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include INCLUDES += -I$(RIOTBOARD)/arduino-mkrwan1300/include

6
boards/cc2538dk/Makefile.include
View File

@ -11,9 +11,9 @@ include $(RIOTMAKE)/tools/serial.inc.mk
include $(RIOTMAKE)/tools/renode.inc.mk include $(RIOTMAKE)/tools/renode.inc.mk
# debugger config # debugger config
DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh DEBUGGER = $(RIOTBOARD)/cc2538dk/dist/debug.sh
DEBUGSERVER = JLinkGDBServer -device CC2538SF53 DEBUGSERVER = JLinkGDBServer -device CC2538SF53
RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh RESET ?= $(RIOTBOARD)/cc2538dk/dist/reset.sh
# Define the flash-tool and default port: # Define the flash-tool and default port:
PROGRAMMER ?= cc2538-bsl PROGRAMMER ?= cc2538-bsl
@ -22,7 +22,7 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FFLAGS = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE) FFLAGS = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE)
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh
FFLAGS = $(BINDIR) $(FLASHFILE) FFLAGS = $(BINDIR) $(FLASHFILE)
endif endif

2
boards/chronos/Makefile.include
View File

@ -3,6 +3,6 @@ FLASHFILE ?= $(HEXFILE)
FLASHER = mspdebug FLASHER = mspdebug
FFLAGS = rf2500 "prog $(FLASHFILE)" FFLAGS = rf2500 "prog $(FLASHFILE)"
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include INCLUDES += -I$(RIOTBOARD)/chronos/drivers/include
USEMODULE += chronos-drivers USEMODULE += chronos-drivers

4
boards/f4vi1/Makefile.include
View File

@ -10,10 +10,10 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# st-flash # st-flash
FLASHER = st-flash FLASHER = st-flash
DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh DEBUGGER = $(RIOTBOARD)/f4vi1/dist/debug.sh
DEBUGSERVER = st-util DEBUGSERVER = st-util
# define st-flash parameters # define st-flash parameters
FLASHFILE ?= $(BINFILE) FLASHFILE ?= $(BINFILE)
FFLAGS = write $(FLASHFILE) 0x8000000 FFLAGS = write $(FLASHFILE) 0x8000000
DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE) DEBUGGER_FLAGS = $(RIOTBOARD)/f4vi1/dist/gdb.conf $(ELFFILE)

2
boards/feather-m0/Makefile.include
View File

@ -18,4 +18,4 @@ else
endif endif
# setup the boards dependencies # setup the boards dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/feather-m0/Makefile.dep

2
boards/mbed_lpc1768/Makefile.include
View File

@ -1,4 +1,4 @@
FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh FLASHER = $(RIOTBOARD)/mbed_lpc1768/dist/flash.sh
DEBUGGER = DEBUGGER =
DEBUGSERVER = DEBUGSERVER =

4
boards/native/Makefile.include
View File

@ -1,5 +1,5 @@
export NATIVEINCLUDES += -DNATIVE_INCLUDES export NATIVEINCLUDES += -DNATIVE_INCLUDES
export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export NATIVEINCLUDES += -I$(RIOTBOARD)/native/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
@ -11,7 +11,7 @@ else
DEBUGGER ?= gdb DEBUGGER ?= gdb
endif endif
RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh RESET ?= $(RIOTBOARD)/native/dist/reset.sh
FLASHER = true FLASHER = true
FLASHFILE ?= $(ELFFILE) FLASHFILE ?= $(ELFFILE)

2
boards/opencm904/Makefile.include
View File

@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# custom flasher to use with the bootloader # custom flasher to use with the bootloader
FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py FLASHER = $(RIOTBOARD)/opencm904/dist/robotis-loader.py
DEBUGGER = DEBUGGER =
DEBUGSERVER = DEBUGSERVER =

2
boards/openmote-b/Makefile.include
View File

@ -25,7 +25,7 @@ else ifeq ($(PROGRAMMER),jlink)
export FLASH_ADDR = 0x200000 export FLASH_ADDR = 0x200000
export JLINK_DEVICE = CC2538SF53 export JLINK_DEVICE = CC2538SF53
export JLINK_IF = JTAG export JLINK_IF = JTAG
export JLINK_RESET_FILE = $(RIOTBOARD)/$(BOARD)/dist/hw_reset.seg export JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
endif endif

2
boards/sensebox_samd21/Makefile.include
View File

@ -18,4 +18,4 @@ else
endif endif
# setup the boards dependencies # setup the boards dependencies
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/sensebox_samd21/Makefile.dep