From ecfab2bb0ea4918b3ab02c3a64292a4a3ac13d01 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Thu, 14 Oct 2021 16:17:21 +0200
Subject: stm32, lm4f: "build/system.elf" is the default target

---
 src/arch/lm4f120h5qr-stellaris/Makefile.inc | 12 ++++++------
 src/arch/stm32f446re-nucleo/Makefile.inc    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/arch/lm4f120h5qr-stellaris/Makefile.inc b/src/arch/lm4f120h5qr-stellaris/Makefile.inc
index 38f799f..61a8a8e 100644
--- a/src/arch/lm4f120h5qr-stellaris/Makefile.inc
+++ b/src/arch/lm4f120h5qr-stellaris/Makefile.inc
@@ -85,12 +85,6 @@ OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} ${ASM_TARGETS:.S=.o}
 %.o : %.s | include/config.h
 	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} -c -o $@ ${@:.o=.S}
 
-ext/libopencm3/Makefile:
-	git submodule update --init
-
-ext/libopencm3/lib/libopencm3_lm4f.a: ext/libopencm3/Makefile
-	${MAKE} -C ext/libopencm3
-
 build/system.elf: ${OBJECTS} ext/libopencm3/lib/libopencm3_stm32f4.a
 	${QUIET}mkdir -p build
 	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} \
@@ -101,6 +95,12 @@ build/system.elf: ${OBJECTS} ext/libopencm3/lib/libopencm3_stm32f4.a
 		-o $@
 	${QUIET}${SIZE} build/system.elf | tail -n1 | awk '{ print "  ROM: " ($$1+$$2) " (" int(($$1+$$2)*100/49152) "%)     RAM: " ($$2 + $$3) " (" int(($$2+$$3)*100/4096) "%)" }'
 
+ext/libopencm3/Makefile:
+	git submodule update --init
+
+ext/libopencm3/lib/libopencm3_lm4f.a: ext/libopencm3/Makefile
+	${MAKE} -C ext/libopencm3
+
 program: build/system.elf
 	${OBJCOPY} -O binary build/system.elf build/system.bin
 	lm4flash build/system.bin
diff --git a/src/arch/stm32f446re-nucleo/Makefile.inc b/src/arch/stm32f446re-nucleo/Makefile.inc
index 2b39d62..33872e0 100644
--- a/src/arch/stm32f446re-nucleo/Makefile.inc
+++ b/src/arch/stm32f446re-nucleo/Makefile.inc
@@ -86,12 +86,6 @@ OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o} ${ASM_TARGETS:.S=.o}
 %.o : %.s | include/config.h
 	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} -c -o $@ ${@:.o=.S}
 
-ext/libopencm3/Makefile:
-	git submodule update --init
-
-ext/libopencm3/lib/libopencm3_stm32f4.a: ext/libopencm3/Makefile
-	${MAKE} -C ext/libopencm3
-
 build/system.elf: ${OBJECTS} ext/libopencm3/lib/libopencm3_stm32f4.a
 	${QUIET}mkdir -p build
 	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} \
@@ -102,6 +96,12 @@ build/system.elf: ${OBJECTS} ext/libopencm3/lib/libopencm3_stm32f4.a
 		-o $@
 	${QUIET}${SIZE} build/system.elf | tail -n1 | awk '{ print "  ROM: " ($$1+$$2) " (" int(($$1+$$2)*100/524288) "%)     RAM: " ($$2 + $$3) " (" int(($$2+$$3)*100/131072) "%)" }'
 
+ext/libopencm3/Makefile:
+	git submodule update --init
+
+ext/libopencm3/lib/libopencm3_stm32f4.a: ext/libopencm3/Makefile
+	${MAKE} -C ext/libopencm3
+
 program: build/system.elf
 	openocd -c 'source [find interface/stlink-v2-1.cfg]' \
 		-c 'transport select hla_swd' -c 'source [find target/stm32f4x.cfg]' \
-- 
cgit v1.2.3