From 4a176a404c5769dba196eb9ddbcde758057837dd Mon Sep 17 00:00:00 2001
From: "S.J.R. van Schaik" <stephan@whiteboxsystems.nl>
Date: Sat, 11 Mar 2017 13:34:00 +0000
Subject: [PATCH] make: move stm32f0-specific CFLAGS and LDFLAGS

---
 Makefile                 | 3 +--
 scripts/Makefile.stm32f0 | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e36bc78..a38e3d8 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ all: $(BUILD)/tbm
 CFLAGS += -Iinclude
 CFLAGS += -Wall -Wundef -Wextra -Wshadow -Wimplicit-function-declaration
 CFLAGS += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes
-CFLAGS += -fno-common --function-sections -fdata-sections
 
 obj-y += source/main.o
 obj-y += source/shell.o
@@ -48,6 +47,6 @@ $(BUILD)/%.o: %.c
 $(BUILD)/tbm: $(obj) $(LDSCRIPT)
 	@echo "LD $@"
 	@mkdir -p $(dir $@)
-	@$(LD) -o $@ $(CFLAGS) $(LDFLAGS) -T $(LDSCRIPT) $(obj) $(LIBS)
+	@$(LD) -o $@ $(CFLAGS) $(LDFLAGS) $(obj) $(LIBS)
 
 .PHONY: clean
diff --git a/scripts/Makefile.stm32f0 b/scripts/Makefile.stm32f0
index dbbc6ed..00da9dd 100644
--- a/scripts/Makefile.stm32f0
+++ b/scripts/Makefile.stm32f0
@@ -2,8 +2,10 @@ PREFIX ?= arm-none-eabi
 
 LDSCRIPT = support/stm32f0-discovery.ld
 
+CFLAGS += -fno-common --function-sections -fdata-sections
 LDFLAGS += -static -nostartfiles
 LDFLAGS += -Wl,--gc-sections
+LDFLAGS += -T ${LDSCRIPT}
 LIBS += -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
 
 # Set up libopencm3.