From 3aac4e95c91be3244d68f27159c2667904c8fddd Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Mon, 15 Aug 2016 08:20:16 +0300
Subject: More general system for generating several outputs

---
 tmk_core/chibios.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tmk_core/chibios.mk')

diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index cb67ac6f25..b05d59ee89 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -89,9 +89,9 @@ CHIBISRC = $(STARTUPSRC) \
 	   $(STARTUPASM) \
 	   $(PORTASM) \
 	   $(OSALASM)         
-	   
-SRC += $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))
 
+CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))
+	   
 EXTRAINCDIRS += $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-- 
cgit v1.2.3


From 3442e216dcec3ce6c8ba1c755b0d647a7f384f01 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Mon, 15 Aug 2016 09:07:32 +0300
Subject: Move bootloader_defs include to build_keyboard

Also fix it for subprojects
---
 tmk_core/chibios.mk | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'tmk_core/chibios.mk')

diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index b05d59ee89..062a712bd1 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -143,14 +143,6 @@ MCUFLAGS = -mcpu=$(MCU)
 
 DEBUG = gdb
 
-# Define ASM defines here
-# bootloader definitions may be used in the startup .s file
-ifneq ("$(wildcard $(KEYBOARD_PATH)/bootloader_defs.h)","")
-    OPT_DEFS += -include $(KEYBOARD_PATH)/bootloader_defs.h
-else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","")
-    OPT_DEFS += -include $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h
-endif
-
 # List any extra directories to look for libraries here.
 EXTRALIBDIRS = $(RULESPATH)/ld
 
-- 
cgit v1.2.3