aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <clyne@bitgloo.com>2021-03-21 16:42:06 -0400
committerClyne Sullivan <clyne@bitgloo.com>2021-03-21 16:42:06 -0400
commitd7285a20d9bfd1335b72bfcfd09b9a723415f0da (patch)
tree963bd8f971bb3f6f7dc42d1aaad3a781bcf6fc03
parent9b926b81ef1e8a4c7266494ae2a1369380e01b35 (diff)
move firmware source into source folder
-rw-r--r--.gitignore5
-rw-r--r--Makefile13
-rw-r--r--source/board/board.mk (renamed from board/board.mk)8
-rw-r--r--source/board/board_h7.c (renamed from board/board_h7.c)0
-rw-r--r--source/board/board_l4.c (renamed from board/board_l4.c)0
-rw-r--r--source/board/h7/board.h (renamed from board/h7/board.h)0
-rw-r--r--source/board/l4/board.h (renamed from board/l4/board.h)0
-rw-r--r--source/cfg/chconf.h (renamed from cfg/chconf.h)0
-rw-r--r--source/cfg/halconf.h (renamed from cfg/halconf.h)0
-rw-r--r--source/cfg/mcuconf.h (renamed from cfg/mcuconf.h)0
-rw-r--r--source/cfg/mcuconf_h7.h (renamed from cfg/mcuconf_h7.h)0
-rw-r--r--source/cfg/mcuconf_l4.h (renamed from cfg/mcuconf_l4.h)0
-rw-r--r--source/ld/STM32H723xG.ld (renamed from STM32H723xG.ld)0
-rw-r--r--source/ld/STM32L476xG.ld (renamed from STM32L476xG.ld)0
14 files changed, 15 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 36cb465..808c653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-build
**/.*
-gui/stmdspgui
**/*.o
**/*.so
perf*
+build
+eagle/*#*
+gui/stmdspgui
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
diff --git a/board/board.mk b/source/board/board.mk
index f6df51a..155285a 100644
--- a/board/board.mk
+++ b/source/board/board.mk
@@ -1,15 +1,15 @@
# List of all the board related files.
ifeq ($(TARGET_PLATFORM),H7)
- BOARDSRC = ./board/board_h7.c
+ BOARDSRC = ./source/board/board_h7.c
else
- BOARDSRC = ./board/board_l4.c
+ BOARDSRC = ./source/board/board_l4.c
endif
# Required include directories
ifeq ($(TARGET_PLATFORM),H7)
- BOARDINC = ./board/h7
+ BOARDINC = ./source/board/h7
else
- BOARDINC = ./board/l4
+ BOARDINC = ./source/board/l4
endif
# Shared variables
diff --git a/board/board_h7.c b/source/board/board_h7.c
index 2868726..2868726 100644
--- a/board/board_h7.c
+++ b/source/board/board_h7.c
diff --git a/board/board_l4.c b/source/board/board_l4.c
index cd16e43..cd16e43 100644
--- a/board/board_l4.c
+++ b/source/board/board_l4.c
diff --git a/board/h7/board.h b/source/board/h7/board.h
index 58ba40e..58ba40e 100644
--- a/board/h7/board.h
+++ b/source/board/h7/board.h
diff --git a/board/l4/board.h b/source/board/l4/board.h
index ff42cd1..ff42cd1 100644
--- a/board/l4/board.h
+++ b/source/board/l4/board.h
diff --git a/cfg/chconf.h b/source/cfg/chconf.h
index 628d7e8..628d7e8 100644
--- a/cfg/chconf.h
+++ b/source/cfg/chconf.h
diff --git a/cfg/halconf.h b/source/cfg/halconf.h
index 24c6fde..24c6fde 100644
--- a/cfg/halconf.h
+++ b/source/cfg/halconf.h
diff --git a/cfg/mcuconf.h b/source/cfg/mcuconf.h
index 0d4d5c1..0d4d5c1 100644
--- a/cfg/mcuconf.h
+++ b/source/cfg/mcuconf.h
diff --git a/cfg/mcuconf_h7.h b/source/cfg/mcuconf_h7.h
index c6a254b..c6a254b 100644
--- a/cfg/mcuconf_h7.h
+++ b/source/cfg/mcuconf_h7.h
diff --git a/cfg/mcuconf_l4.h b/source/cfg/mcuconf_l4.h
index 438e0be..438e0be 100644
--- a/cfg/mcuconf_l4.h
+++ b/source/cfg/mcuconf_l4.h
diff --git a/STM32H723xG.ld b/source/ld/STM32H723xG.ld
index 7d5bafb..7d5bafb 100644
--- a/STM32H723xG.ld
+++ b/source/ld/STM32H723xG.ld
diff --git a/STM32L476xG.ld b/source/ld/STM32L476xG.ld
index b3a332d..b3a332d 100644
--- a/STM32L476xG.ld
+++ b/source/ld/STM32L476xG.ld