From d7285a20d9bfd1335b72bfcfd09b9a723415f0da Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Sun, 21 Mar 2021 16:42:06 -0400
Subject: move firmware source into source folder

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 360811d..bec5309 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ endif
 
 # Imported source files and paths.
 CHIBIOS  := ./ChibiOS_20.3.2
-CONFDIR  := ./cfg
+CONFDIR  := ./source/cfg
 BUILDDIR := ./build
 DEPDIR   := ./.dep
 
@@ -121,13 +121,16 @@ ifeq ($(TARGET_PLATFORM),H7)
 else
   include $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/platform.mk
 endif
-include ./board/board.mk
+include ./source/board/board.mk
 include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Auto-build files in ./source recursively.
-include $(CHIBIOS)/tools/mk/autobuild.mk
+#include $(CHIBIOS)/tools/mk/autobuild.mk
+ALLCSRC += $(wildcard source/*.c)
+ALLCPPSRC += $(wildcard source/*.cpp)
+ALLASMSRC += $(wildcard source/*.s)
 # Other files (optional).
 #include $(CHIBIOS)/test/lib/test.mk
 #include $(CHIBIOS)/test/rt/rt_test.mk
@@ -135,9 +138,9 @@ include $(CHIBIOS)/tools/mk/autobuild.mk
 
 # Define linker script file here
 ifeq ($(TARGET_PLATFORM),H7)
-  LDSCRIPT = STM32H723xG.ld
+  LDSCRIPT = source/ld/STM32H723xG.ld
 else
-  LDSCRIPT = STM32L476xG.ld
+  LDSCRIPT = source/ld/STM32L476xG.ld
 endif
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
-- 
cgit v1.2.3