Skip to content

Commit 545fd8f

Browse files
karlpBOJIT
authored andcommitted
tests: gadget0: switch to Linker script generation
We're about to drop the very limited set of fixed linker scripts we have, so convert all the in tree code to linker script generation
1 parent a5bf19d commit 545fd8f

9 files changed

Lines changed: 31 additions & 63 deletions

tests/gadget-zero/Makefile.efm32hg309-generic

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/efm32/hg/efm32hg309f64.ld
36-
OPENCM3_LIB = opencm3_efm32hg
37-
OPENCM3_DEFS = -DEFM32HG
38-
FP_FLAGS ?= -mfloat-abi=soft
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2-1
41-
#OOCD_TARGET = efm32
42-
OOCD_FILE = openocd.efm32hg309-generic.cfg
35+
DEVICE=efm32hg309f64
36+
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32f072disco

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/f0/stm32f07xzb.ld
36-
OPENCM3_LIB = opencm3_stm32f0
37-
OPENCM3_DEFS = -DSTM32F0
38-
#FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m0 $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2
41-
#OOCD_TARGET = stm32f4x
42-
OOCD_FILE = openocd.stm32f072disco.cfg
35+
DEVICE=stm32f072rb
36+
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32f103-generic

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../../
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/f1/stm32f103x8.ld
36-
OPENCM3_LIB = opencm3_stm32f1
37-
OPENCM3_DEFS = -DSTM32F1
38-
ARCH_FLAGS = -mthumb -mcpu=cortex-m3
39-
#OOCD_INTERFACE = jlink
40-
#OOCD_TARGET = stm32f1x
41-
OOCD_FILE = openocd.stm32f103-generic.cfg
35+
DEVICE=stm32f103x8
36+
OOCD_FILE = openocd.$(BOARD).cfg
4237

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4340
include ../rules.mk

tests/gadget-zero/Makefile.stm32f3-disco

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/f3/stm32f303xc.ld
36-
OPENCM3_LIB = opencm3_stm32f3
37-
OPENCM3_DEFS = -DSTM32F3
38-
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2
41-
#OOCD_TARGET = stm32f3x
42-
OOCD_FILE = openocd.stm32f3-disco.cfg
35+
DEVICE=stm32f303xc
36+
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32f429i-disco

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/f4/stm32f405x6.ld
36-
OPENCM3_LIB = opencm3_stm32f4
37-
OPENCM3_DEFS = -DSTM32F4
38-
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2
41-
#OOCD_TARGET = stm32f4x
35+
DEVICE=stm32f405re
4236
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32f4disco

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/f4/stm32f405x6.ld
36-
OPENCM3_LIB = opencm3_stm32f4
37-
OPENCM3_DEFS = -DSTM32F4
38-
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2
41-
#OOCD_TARGET = stm32f4x
42-
OOCD_FILE = openocd.stm32f4disco.cfg
35+
DEVICE=stm32f405re
36+
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32l053disco

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/l0/stm32l0xx8.ld
36-
OPENCM3_LIB = opencm3_stm32l0
37-
OPENCM3_DEFS = -DSTM32L0
38-
#FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
39-
ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS)
40-
#OOCD_INTERFACE = stlink-v2-1
41-
#OOCD_TARGET = stm32l0
42-
OOCD_FILE = openocd.stm32l053disco.cfg
35+
DEVICE=stm32l053x8
36+
OOCD_FILE = openocd.$(BOARD).cfg
4337

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4440
include ../rules.mk

tests/gadget-zero/Makefile.stm32l1-generic

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
3232
OPENCM3_DIR=../..
3333

3434
### This section can go to an arch shared rules eventually...
35-
LDSCRIPT = ../../lib/stm32/l1/stm32l15xx8.ld
36-
OPENCM3_LIB = opencm3_stm32l1
37-
OPENCM3_DEFS = -DSTM32L1
38-
ARCH_FLAGS = -mthumb -mcpu=cortex-m3
39-
#OOCD_INTERFACE = jlink
40-
#OOCD_TARGET = stm32l1x
41-
OOCD_FILE = openocd.stm32l1-generic.cfg
35+
DEVICE=stm32l151c8
36+
OOCD_FILE = openocd.$(BOARD).cfg
4237

38+
include $(OPENCM3_DIR)/mk/genlink-config.mk
39+
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4340
include ../rules.mk

tests/gadget-zero/Makefile.tilm4f120xl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,5 @@ DEVICE=lm4f120xl
3636
OOCD_FILE = openocd.$(BOARD).cfg
3737

3838
include $(OPENCM3_DIR)/mk/genlink-config.mk
39-
#include $(OPENCM3_DIR)/mk/gcc-config.mk
4039
include $(OPENCM3_DIR)/mk/genlink-rules.mk
4140
include ../rules.mk
42-
#include $(OPENCM3_DIR)/mk/gcc-rules.mk

0 commit comments

Comments
 (0)