Move bootloader_defs include to build_keyboard

Also fix it for subprojects

diff --git a/build_keyboard.mk b/build_keyboard.mk
index a6b578efbc6172f53faaceb9b4ab95b18ab511f8..e8d8f3572b7da90001ad80717a1c70a162e3e4bb 100644 (file)
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -54,6 +54,15 @@ ifeq ($(PLATFORM),CHIBIOS)
        include $(TMK_PATH)/protocol/chibios.mk
        include $(TMK_PATH)/chibios.mk
        OPT_OS = chibios
+       ifneq ("$(wildcard $(SUBPROJECT_PATH)/bootloader_defs.h)","")
+               OPT_DEFS += -include $(SUBPROJECT_PATH)/bootloader_defs.h
+       else ifneq ("$(wildcard $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h)","")
+               OPT_DEFS += -include $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h
+       else 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
 endif
 
 CONFIG_H = $(KEYBOARD_PATH)/config.h

diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index b05d59ee890a589e74d67cd8da87c6f095173d8e..062a712bd106d5c5b3d4e601a59c938a3aee6e79 100644 (file)
--- 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