diff options
author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 21:01:46 +0300 |
---|---|---|
committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 21:01:46 +0300 |
commit | cff26bc48413ec62d4f4a37e3a6ba34721e7670c (patch) | |
tree | 84c78137841ad83036de7e36579bc7973b024f7a /tmk_core/chibios.mk | |
parent | a5b1af4999345239df5086351b52a5b4d2daa97e (diff) | |
parent | 36b6a96596e6cbca879d5304a586e279c15b04a9 (diff) | |
download | firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.tar.gz firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.tar.bz2 firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.zip |
Merge branch 'master' into fix_line_endings
Diffstat (limited to 'tmk_core/chibios.mk')
-rw-r--r-- | tmk_core/chibios.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index cb67ac6f2..062a712bd 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) \ @@ -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 |