aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-10-14 11:32:19 -1000
committerGitHub <noreply@github.com>2017-10-14 11:32:19 -1000
commit800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch)
tree718e43d976bc71627558b5f9e1b657e8a64e4131 /tmk_core
parente5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff)
downloadqmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.tar.gz
qmk_firmware-800ec55dfca06b4630acf62cbb5f130c4031e4f1.zip
Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/chibios.mk35
-rw-r--r--tmk_core/rules.mk2
2 files changed, 32 insertions, 5 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index c938eaeb9..c804d237e 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -46,13 +46,32 @@ endif
46include $(PLATFORM_MK) 46include $(PLATFORM_MK)
47 47
48 48
49BOARD_MK = $(KEYBOARD_PATH)/boards/$(BOARD)/board.mk 49BOARD_MK :=
50
51ifneq ("$(wildcard $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk)","")
52 BOARD_PATH = $(KEYBOARD_PATH_5)
53 BOARD_MK += $(KEYBOARD_PATH_5)/boards/$(BOARD)/board.mk
54else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk)","")
55 BOARD_PATH = $(KEYBOARD_PATH_4)
56 BOARD_MK += $(KEYBOARD_PATH_4)/boards/$(BOARD)/board.mk
57else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk)","")
58 BOARD_PATH = $(KEYBOARD_PATH_3)
59 BOARD_MK += $(KEYBOARD_PATH_3)/boards/$(BOARD)/board.mk
60else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk)","")
61 BOARD_PATH = $(KEYBOARD_PATH_2)
62 BOARD_MK += $(KEYBOARD_PATH_2)/boards/$(BOARD)/board.mk
63else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk)","")
64 BOARD_PATH = $(KEYBOARD_PATH_1)
65 BOARD_MK += $(KEYBOARD_PATH_1)/boards/$(BOARD)/board.mk
66endif
67
50ifeq ("$(wildcard $(BOARD_MK))","") 68ifeq ("$(wildcard $(BOARD_MK))","")
51 BOARD_MK = $(CHIBIOS)/os/hal/boards/$(BOARD)/board.mk 69 BOARD_MK = $(CHIBIOS)/os/hal/boards/$(BOARD)/board.mk
52 ifeq ("$(wildcard $(BOARD_MK))","") 70 ifeq ("$(wildcard $(BOARD_MK))","")
53 BOARD_MK = $(CHIBIOS_CONTRIB)/os/hal/boards/$(BOARD)/board.mk 71 BOARD_MK = $(CHIBIOS_CONTRIB)/os/hal/boards/$(BOARD)/board.mk
54 endif 72 endif
55endif 73endif
74
56include $(BOARD_MK) 75include $(BOARD_MK)
57include $(CHIBIOS)/os/hal/osal/rt/osal.mk 76include $(CHIBIOS)/os/hal/osal/rt/osal.mk
58# RTOS files (optional). 77# RTOS files (optional).
@@ -72,10 +91,18 @@ RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
72endif 91endif
73 92
74# Define linker script file here 93# Define linker script file here
75ifneq ("$(wildcard $(KEYBOARD_PATH)/ld/$(MCU_LDSCRIPT).ld)","") 94ifneq ("$(wildcard $(KEYBOARD_PATH_5)/ld/$(MCU_LDSCRIPT).ld)","")
76LDSCRIPT = $(KEYBOARD_PATH)/ld/$(MCU_LDSCRIPT).ld 95 LDSCRIPT = $(KEYBOARD_PATH_5)/ld/$(MCU_LDSCRIPT).ld
96else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/ld/$(MCU_LDSCRIPT).ld)","")
97 LDSCRIPT = $(KEYBOARD_PATH_4)/ld/$(MCU_LDSCRIPT).ld
98else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/ld/$(MCU_LDSCRIPT).ld)","")
99 LDSCRIPT = $(KEYBOARD_PATH_3)/ld/$(MCU_LDSCRIPT).ld
100else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
101 LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld
102else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
103 LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
77else 104else
78LDSCRIPT = $(STARTUPLD)/$(MCU_LDSCRIPT).ld 105 LDSCRIPT = $(STARTUPLD)/$(MCU_LDSCRIPT).ld
79endif 106endif
80 107
81CHIBISRC = $(STARTUPSRC) \ 108CHIBISRC = $(STARTUPSRC) \
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 73ffeaac1..53e79ef47 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -290,7 +290,7 @@ BEGIN = gccversion sizebefore
290define GEN_OBJRULE 290define GEN_OBJRULE
291$1_INCFLAGS := $$(patsubst %,-I%,$$($1_INC)) 291$1_INCFLAGS := $$(patsubst %,-I%,$$($1_INC))
292ifdef $1_CONFIG 292ifdef $1_CONFIG
293$1_CONFIG_FLAGS += -include $$($1_CONFIG) 293$1_CONFIG_FLAGS += $$(patsubst %,-include %,$$($1_CONFIG))
294endif 294endif
295$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) 295$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS)
296$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) 296$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS)