fixup! boards: slwstk6000b: add JLink Device to modules.txt

RIOT-OS · Apr 2, 2018 · 1aa560e · 1aa560e
1 parent 49962f1
commit 1aa560e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/boards/slwstk6000b/Makefile.include b/boards/slwstk6000b/Makefile.include
@@ -15,7 +15,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_DEVICE := $(MODULE_JLINK_DEVICE)
 include $(RIOTMAKE)/tools/jlink.inc.mk
 
 # add board common drivers

diff --git a/boards/slwstk6000b/module-info.mk b/boards/slwstk6000b/module-info.mk
@@ -17,3 +17,4 @@ endif
 
 # Export variables to use in this build.
 export MODULE_CPU = $(word 2, $(MODULE_INFO))
+export MODULE_JLINK_DEVICE = $(word 3, $(MODULE_INFO))
diff --git a/boards/slwstk6000b/modules.txt b/boards/slwstk6000b/modules.txt
@@ -4,21 +4,21 @@
 # The intended usage is to grep for the exact module name, and split by spaces
 # to get the required information.
 
-# Module - CPU
-slwrb4150a efr32mg1p233f256gm48
-slwrb4150b efr32mg1p233f256gm48
-slwrb4151a efr32mg1p232f256gm48
-slwrb4152a efr32mg1p232f256gm48
-slwrb4153a efr32mg1p132f256gm48
-slwrb4154a efr32mg1p732f256gm32
-slwrb4158a efr32mg13p733f512gm48
-slwrb4159a efr32mg13p632f512gm48
-slwrb4161a efr32mg12p432f1024gl125
-slwrb4162a efr32mg12p332f1024gl125
-slwrb4163a efr32mg12p433f1024gl125
-slwrb4164a efr32mg12p433f1024gl125
-slwrb4167a efr32mg13p733f512gm48
-slwrb4168a efr32mg13p732f512gm48
-slwrb4169a efr32mg14p733f256gm48
-slwrb4169b efr32mg14p733f256gm48
-slwrb4170a efr32mg12p433f1024gm68
+# Module - CPU - JLink Device
+slwrb4150a efr32mg1p233f256gm48 efr32mg1pxxxf256
+slwrb4150b efr32mg1p233f256gm48 efr32mg1pxxxf256
+slwrb4151a efr32mg1p232f256gm48 efr32mg1pxxxf256
+slwrb4152a efr32mg1p232f256gm48 efr32mg1pxxxf256
+slwrb4153a efr32mg1p132f256gm48 efr32mg1pxxxf256
+slwrb4154a efr32mg1p732f256gm32 efr32mg1pxxxf256
+slwrb4158a efr32mg13p733f512gm48 efr32mg13p733f512gm48
+slwrb4159a efr32mg13p632f512gm48 efr32mg13p632f512gm48
+slwrb4161a efr32mg12p432f1024gl125 efr32mg12p432f1024gl125
+slwrb4162a efr32mg12p332f1024gl125 efr32mg12p332f1024gl125
+slwrb4163a efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
+slwrb4164a efr32mg12p433f1024gl125 efr32mg12p433f1024gl125
+slwrb4167a efr32mg13p733f512gm48 efr32mg13p733f512gm48
+slwrb4168a efr32mg13p732f512gm48 efr32mg13p732f512gm48
+slwrb4169a efr32mg14p733f256gm48 efr32mg14p733f256gm48
+slwrb4169b efr32mg14p733f256gm48 efr32mg14p733f256gm48
+slwrb4170a efr32mg12p433f1024gm68 efr32mg12p433f1024gm68