RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

boards/*silabs: Move programmer selection to common

Browse Source 
This removes duplication for the jlink case (keeping only any
non-default values in the board makefiles), and opens up STK3700's
OpenOCD programmability for generic boards.
This commit is contained in:
chrysn 2020-02-14 09:32:48 +01:00
parent 80167b8ba4
commit f4b1d60887
7 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boards/common/silabs/Makefile.include
View File

@ -1,2 +1,13 @@
INCLUDES += -I$(RIOTBOARD)/common/silabs/include
INCLUDES += -I$(RIOTBOARD)/common/silabs/drivers/include
PROGRAMMER ?= jlink
export JLINK_DEVICE ?= ${CPU_MODEL}
export OPENOCD_CONFIG ?= board/efm32.cfg
ifeq ($(PROGRAMMER),jlink)
include $(RIOTMAKE)/tools/jlink.inc.mk
else ifeq ($(PROGRAMMER),openocd)
include $(RIOTMAKE)/tools/openocd.inc.mk
endif

1
boards/common/slwstk6000b/Makefile.include
View File

@ -13,7 +13,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing
export JLINK_DEVICE := $(MODULE_JLINK_DEVICE)
include $(RIOTMAKE)/tools/jlink.inc.mk
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

2
boards/slstk3401a/Makefile.include
View File

@ -6,9 +6,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing
export JLINK_DEVICE := $(CPU_MODEL)
export JLINK_PRE_FLASH = r
include $(RIOTMAKE)/tools/jlink.inc.mk
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

2
boards/slstk3402a/Makefile.include
View File

@ -6,9 +6,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing
export JLINK_DEVICE := $(CPU_MODEL)
export JLINK_PRE_FLASH = r
include $(RIOTMAKE)/tools/jlink.inc.mk
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

1
boards/sltb001a/Makefile.include
View File

@ -8,7 +8,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing
export JLINK_DEVICE := EFR32MG1PxxxF256
export JLINK_PRE_FLASH = r
include $(RIOTMAKE)/tools/jlink.inc.mk
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

4
boards/stk3600/Makefile.include
View File

@ -5,9 +5,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing
export JLINK_DEVICE := $(CPU_MODEL)
include $(RIOTMAKE)/tools/jlink.inc.mk
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

11
boards/stk3700/Makefile.include
View File

@ -5,16 +5,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
PROGRAMMER ?= jlink
ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing
export JLINK_DEVICE := $(CPU_MODEL)
include $(RIOTMAKE)/tools/jlink.inc.mk
else ifeq ($(PROGRAMMER),openocd)
export OPENOCD_CONFIG := board/efm32.cfg
include $(RIOTMAKE)/tools/openocd.inc.mk
endif
# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include