From c5c33a46003ba66008774e1ddf9557906df76462 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: Fri, 8 Apr 2016 00:00:02 +0000
Subject: switch to using devices.data linker generation

Still using my own private rules, but now using the linker script generator so
no need to keep expanding on including .ld files in core libopencm3
---
 tests/adc-power/Makefile.stm32f072-disco |  6 +++++-
 tests/adc-power/Makefile.stm32f3-disco   |  8 +-------
 tests/adc-power/Makefile.stm32f4-disco   |  6 +-----
 tests/adc-power/Makefile.stm32l4-disco   | 11 +----------
 4 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'tests/adc-power')

diff --git a/tests/adc-power/Makefile.stm32f072-disco b/tests/adc-power/Makefile.stm32f072-disco
index 99eade8..63917f3 100644
--- a/tests/adc-power/Makefile.stm32f072-disco
+++ b/tests/adc-power/Makefile.stm32f072-disco
@@ -15,5 +15,9 @@ VPATH += $(SHARED_DIR)
 INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
 
 OPENCM3_DIR=../../libopencm3
-include ../../rules.stm32f0.mk
+DEVICE=stm32f072rb
+#OOCD_INTERFACE = stlink-v2
+#OOCD_TARGET = stm32f0x
+OOCD_FILE = ../../openocd/openocd.stm32f072-disco.cfg
+
 include ../../rules.mk
diff --git a/tests/adc-power/Makefile.stm32f3-disco b/tests/adc-power/Makefile.stm32f3-disco
index 98e06be..bdde640 100644
--- a/tests/adc-power/Makefile.stm32f3-disco
+++ b/tests/adc-power/Makefile.stm32f3-disco
@@ -14,13 +14,7 @@ VPATH += $(SHARED_DIR)
 INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
 
 OPENCM3_DIR=../../libopencm3/
-
-### This section can go to an arch shared rules eventually...
-LDSCRIPT = $(OPENCM3_DIR)/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)
+DEVICE=stm32f303vct6
 #OOCD_INTERFACE = stlink-v2
 #OOCD_TARGET = stm32f3x
 OOCD_FILE = ../../openocd/openocd.stm32f3-disco.cfg
diff --git a/tests/adc-power/Makefile.stm32f4-disco b/tests/adc-power/Makefile.stm32f4-disco
index a990ec5..412ff52 100644
--- a/tests/adc-power/Makefile.stm32f4-disco
+++ b/tests/adc-power/Makefile.stm32f4-disco
@@ -32,11 +32,7 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
 OPENCM3_DIR=../../libopencm3/
 
 ### This section can go to an arch shared rules eventually...
-LDSCRIPT = $(OPENCM3_DIR)/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)
+DEVICE=stm32f405xg
 #OOCD_INTERFACE = stlink-v2
 #OOCD_TARGET = stm32f4x
 OOCD_FILE = ../../openocd/openocd.stm32f4-disco.cfg
diff --git a/tests/adc-power/Makefile.stm32l4-disco b/tests/adc-power/Makefile.stm32l4-disco
index 7957e9d..245d01a 100644
--- a/tests/adc-power/Makefile.stm32l4-disco
+++ b/tests/adc-power/Makefile.stm32l4-disco
@@ -16,17 +16,8 @@ INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
 OPENCM3_DIR=../../libopencm3/
 
 ### This section can go to an arch shared rules eventually...
-#DEVICE=stm32l476vgt6
-#SRCLIBDIR=$(OPENCM3_DIR)
-#include $(OPENCM3_DIR)/ld/Makefile.linker
-LDSCRIPT=$(OPENCM3_DIR)/lib/stm32/l4/stm32l4xxg.ld
-
-OPENCM3_LIB = opencm3_stm32l4
-OPENCM3_DEFS = -DSTM32L4
-FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
-ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)
+DEVICE=stm32l476vgt6
 #OOCD_INTERFACE = stlink-v2-1
 #OOCD_TARGET = stm32l4x
 OOCD_FILE = ../../openocd/openocd.stm32l4-disco.cfg
-
 include ../../rules.mk
-- 
cgit