From fd3c950b29c7073cdad86f762198aa5b1c12f5d3 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sun, 11 Oct 2020 22:28:20 +0000 Subject: [PATCH] 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 --- tests/gadget-zero/Makefile.efm32hg309-generic | 12 ++++-------- tests/gadget-zero/Makefile.stm32f072disco | 12 ++++-------- tests/gadget-zero/Makefile.stm32f103-generic | 11 ++++------- tests/gadget-zero/Makefile.stm32f3-disco | 12 ++++-------- tests/gadget-zero/Makefile.stm32f429i-disco | 10 +++------- tests/gadget-zero/Makefile.stm32f4disco | 12 ++++-------- tests/gadget-zero/Makefile.stm32l053disco | 12 ++++-------- tests/gadget-zero/Makefile.stm32l1-generic | 11 ++++------- tests/gadget-zero/Makefile.tilm4f120xl | 2 -- 9 files changed, 31 insertions(+), 63 deletions(-) diff --git a/tests/gadget-zero/Makefile.efm32hg309-generic b/tests/gadget-zero/Makefile.efm32hg309-generic index 00eac7d7..27a47743 100644 --- a/tests/gadget-zero/Makefile.efm32hg309-generic +++ b/tests/gadget-zero/Makefile.efm32hg309-generic @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/efm32/hg/efm32hg309f64.ld -OPENCM3_LIB = opencm3_efm32hg -OPENCM3_DEFS = -DEFM32HG -FP_FLAGS ?= -mfloat-abi=soft -ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2-1 -#OOCD_TARGET = efm32 -OOCD_FILE = openocd.efm32hg309-generic.cfg +DEVICE=efm32hg309f64 +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32f072disco b/tests/gadget-zero/Makefile.stm32f072disco index e155a523..f567805f 100644 --- a/tests/gadget-zero/Makefile.stm32f072disco +++ b/tests/gadget-zero/Makefile.stm32f072disco @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/f0/stm32f07xzb.ld -OPENCM3_LIB = opencm3_stm32f0 -OPENCM3_DEFS = -DSTM32F0 -#FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ARCH_FLAGS = -mthumb -mcpu=cortex-m0 $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2 -#OOCD_TARGET = stm32f4x -OOCD_FILE = openocd.stm32f072disco.cfg +DEVICE=stm32f072rb +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32f103-generic b/tests/gadget-zero/Makefile.stm32f103-generic index a27dd607..a413aa9c 100644 --- a/tests/gadget-zero/Makefile.stm32f103-generic +++ b/tests/gadget-zero/Makefile.stm32f103-generic @@ -32,12 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../../ ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/f1/stm32f103x8.ld -OPENCM3_LIB = opencm3_stm32f1 -OPENCM3_DEFS = -DSTM32F1 -ARCH_FLAGS = -mthumb -mcpu=cortex-m3 -#OOCD_INTERFACE = jlink -#OOCD_TARGET = stm32f1x -OOCD_FILE = openocd.stm32f103-generic.cfg +DEVICE=stm32f103x8 +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32f3-disco b/tests/gadget-zero/Makefile.stm32f3-disco index 3a60392e..5e419832 100644 --- a/tests/gadget-zero/Makefile.stm32f3-disco +++ b/tests/gadget-zero/Makefile.stm32f3-disco @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/f3/stm32f303xc.ld -OPENCM3_LIB = opencm3_stm32f3 -OPENCM3_DEFS = -DSTM32F3 -FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2 -#OOCD_TARGET = stm32f3x -OOCD_FILE = openocd.stm32f3-disco.cfg +DEVICE=stm32f303xc +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32f429i-disco b/tests/gadget-zero/Makefile.stm32f429i-disco index d1c432fd..f13c4f66 100644 --- a/tests/gadget-zero/Makefile.stm32f429i-disco +++ b/tests/gadget-zero/Makefile.stm32f429i-disco @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/f4/stm32f405x6.ld -OPENCM3_LIB = opencm3_stm32f4 -OPENCM3_DEFS = -DSTM32F4 -FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2 -#OOCD_TARGET = stm32f4x +DEVICE=stm32f405re OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32f4disco b/tests/gadget-zero/Makefile.stm32f4disco index ca737cb3..20cffcec 100644 --- a/tests/gadget-zero/Makefile.stm32f4disco +++ b/tests/gadget-zero/Makefile.stm32f4disco @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/f4/stm32f405x6.ld -OPENCM3_LIB = opencm3_stm32f4 -OPENCM3_DEFS = -DSTM32F4 -FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2 -#OOCD_TARGET = stm32f4x -OOCD_FILE = openocd.stm32f4disco.cfg +DEVICE=stm32f405re +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32l053disco b/tests/gadget-zero/Makefile.stm32l053disco index 9c79127d..6d7f028c 100644 --- a/tests/gadget-zero/Makefile.stm32l053disco +++ b/tests/gadget-zero/Makefile.stm32l053disco @@ -32,13 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/l0/stm32l0xx8.ld -OPENCM3_LIB = opencm3_stm32l0 -OPENCM3_DEFS = -DSTM32L0 -#FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS) -#OOCD_INTERFACE = stlink-v2-1 -#OOCD_TARGET = stm32l0 -OOCD_FILE = openocd.stm32l053disco.cfg +DEVICE=stm32l053x8 +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.stm32l1-generic b/tests/gadget-zero/Makefile.stm32l1-generic index 9a410de4..6318896f 100644 --- a/tests/gadget-zero/Makefile.stm32l1-generic +++ b/tests/gadget-zero/Makefile.stm32l1-generic @@ -32,12 +32,9 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) OPENCM3_DIR=../.. ### This section can go to an arch shared rules eventually... -LDSCRIPT = ../../lib/stm32/l1/stm32l15xx8.ld -OPENCM3_LIB = opencm3_stm32l1 -OPENCM3_DEFS = -DSTM32L1 -ARCH_FLAGS = -mthumb -mcpu=cortex-m3 -#OOCD_INTERFACE = jlink -#OOCD_TARGET = stm32l1x -OOCD_FILE = openocd.stm32l1-generic.cfg +DEVICE=stm32l151c8 +OOCD_FILE = openocd.$(BOARD).cfg +include $(OPENCM3_DIR)/mk/genlink-config.mk +include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk diff --git a/tests/gadget-zero/Makefile.tilm4f120xl b/tests/gadget-zero/Makefile.tilm4f120xl index d458b338..c8a36ff9 100644 --- a/tests/gadget-zero/Makefile.tilm4f120xl +++ b/tests/gadget-zero/Makefile.tilm4f120xl @@ -36,7 +36,5 @@ DEVICE=lm4f120xl OOCD_FILE = openocd.$(BOARD).cfg include $(OPENCM3_DIR)/mk/genlink-config.mk -#include $(OPENCM3_DIR)/mk/gcc-config.mk include $(OPENCM3_DIR)/mk/genlink-rules.mk include ../rules.mk -#include $(OPENCM3_DIR)/mk/gcc-rules.mk