diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-08-27 13:49:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 13:49:42 -0400 |
| commit | 36b6a96596e6cbca879d5304a586e279c15b04a9 (patch) | |
| tree | 7fdd6b9084f06e5126516ac61756120e1ce1eb63 /tmk_core/chibios.mk | |
| parent | 2c8f6557e6994d3fe4fa2038f6cb4a4e51caf3a9 (diff) | |
| parent | 265df7d5da5ead27bef3d00fce7d0f2bf133e9cc (diff) | |
| download | qmk_firmware-36b6a96596e6cbca879d5304a586e279c15b04a9.tar.gz qmk_firmware-36b6a96596e6cbca879d5304a586e279c15b04a9.zip | |
Merge pull request #666 from fredizzimo/makefile_overhaul
Makefile overhaul
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 cb67ac6f25..062a712bd1 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 |