From 76ce1dd0e3a3584e15228be19969b7404b6cfeb3 Mon Sep 17 00:00:00 2001
From: inmarket <inmarket@ugfx.org>
Date: Sat, 29 Apr 2017 17:42:14 +1000
Subject: Update ChibiOS make scripts to support later versions of ChibiOS

---
 tools/gmake_scripts/os_chibios_3.mk | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'tools/gmake_scripts/os_chibios_3.mk')

diff --git a/tools/gmake_scripts/os_chibios_3.mk b/tools/gmake_scripts/os_chibios_3.mk
index 1a44f4b1..8e8b139d 100644
--- a/tools/gmake_scripts/os_chibios_3.mk
+++ b/tools/gmake_scripts/os_chibios_3.mk
@@ -25,17 +25,29 @@
 # CHIBIOS_PROCESS_STACKSIZE       Size of the ChibiOS process stack. Only useful if the link script supports it - default is 0x400
 # CHIBIOS_EXCEPTIONS_STACKSIZE    Size of the ChibiOS exceptopms stack. Only useful if the link script supports it - default is 0x400
 #
+# Other ChibiOS things you might want to add to your SRC in your makefile...
+#	$(TESTSRC) $(LWSRC) $(FATFSSRC) $(STREAMSSRC) $(SHELLSRC) $(CHIBIOS)/os/various/xxxx
+#
+# Other ChibiOS things you might want to add to your INCPATH in your makefile...
+#	$(TESTINC) $(LWINC) $(FATFSINC) $(STREAMSINC) $(SHELLINC) $(CHIBIOS)/os/various
+#
+# Note we don't add the above source or folders to the project by default to avoid name potential name conflicts
 
 PATHLIST += CHIBIOS
 
-
-
+# Startup files.
 include $(CHIBIOS)/os/common/ports/$(CHIBIOS_CPUCLASS)/compilers/GCC/mk/$(CHIBIOS_STARTUP).mk
+
+# HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/ports/$(CHIBIOS_PLATFORM)/$(CHIBIOS_DEVICE_FAMILY)/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+
+# RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/rt/ports/$(CHIBIOS_CPUCLASS)/compilers/GCC/mk/port_$(CHIBIOS_PORT).mk
+
+# Specific board files
 ifneq ($(CHIBIOS_BOARD),)
   include $(CHIBIOS)/os/hal/boards/$(CHIBIOS_BOARD)/board.mk
 endif
@@ -79,6 +91,4 @@ SRC  += $(STARTUPSRC) \
         $(BOARDSRC)
 
 # Add ASM files
-SRC  += $(STARTUPASM) \
-        $(PORTASM) \
-        $(OSALASM)
+SRC  += $(STARTUPASM) $(PORTASM) $(OSALASM)
-- 
cgit v1.2.3