Move model-specific files into subfolders.

blinky_test/Makefile

@@ -2,11 +2,11 @@ RPATH = $(ROOT)/src
 
 OBJS += vectors.o
 OBJS += cortex.o
-OBJS += stm32$(stm32).o
 OBJS += blinky.o
 OBJS += util.o
-OBJS += fpec_$(stm32).o
 OBJS += console.o
 OBJS += string.o
 
+SUBDIRS += $(stm32)
+
 console.o: CFLAGS += -DBAUD=115200

blinky_test/f1/Makefile

@@ -0,0 +1,4 @@
+RPATH = $(ROOT)/src/f1
+
+OBJS += stm32.o
+OBJS += fpec.o

bootloader/Makefile

@@ -7,15 +7,14 @@ OBJS += vectors.o
 OBJS += fw_update.o
 OBJS += string.o
 OBJS += cortex.o
-OBJS += stm32$(stm32).o
 OBJS += time.o
 OBJS += timer.o
 OBJS += util.o
-OBJS += fpec_$(stm32).o
 
 OBJS-$(debug) += console.o
 
 SUBDIRS += usb
+SUBDIRS += $(stm32)
 
 .PHONY: $(RPATH)/build_info.c
 build_info.o: CFLAGS += -DFW_MAJOR=$(FW_MAJOR) -DFW_MINOR=$(FW_MINOR)

bootloader/f1/Makefile

@@ -0,0 +1,4 @@
+RPATH = $(ROOT)/src/f1
+
+OBJS += stm32.o
+OBJS += fpec.o

bootloader/f7/Makefile

@@ -0,0 +1,4 @@
+RPATH = $(ROOT)/src/f7
+
+OBJS += stm32.o
+OBJS += fpec.o

src/Makefile

@@ -5,16 +5,15 @@ OBJS += vectors.o
 OBJS += main.o
 OBJS += string.o
 OBJS += cortex.o
-OBJS += stm32$(stm32).o
 OBJS += time.o
 OBJS += timer.o
 OBJS += util.o
 OBJS += floppy.o
-OBJS += fpec_$(stm32).o
 
 OBJS-$(debug) += console.o
 
 SUBDIRS += usb
+SUBDIRS += $(stm32)
 
 .PHONY: build_info.c
 build_info.o: CFLAGS += -DFW_MAJOR=$(FW_MAJOR) -DFW_MINOR=$(FW_MINOR)

src/f1/Makefile

@@ -0,0 +1,2 @@
+OBJS += stm32.o
+OBJS += fpec.o

src/f7/Makefile

@@ -0,0 +1,2 @@
+OBJS += stm32.o
+OBJS += fpec.o

src/floppy.c

@@ -44,9 +44,9 @@ static const struct gw_delay factory_delay_params = {
 };
 
 #if STM32F == 1
-#include "floppy_f1.c"
+#include "f1/floppy.c"
 #elif STM32F == 7
-#include "floppy_f7.c"
+#include "f7/floppy.c"
 #endif
 
 static struct index {