diff options
author | Nick Brassel <nick@tzarc.org> | 2020-06-06 18:52:19 +1000 |
---|---|---|
committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-08-29 14:30:02 -0700 |
commit | 385d49cc39b57e74203e0c1c78c0789d249e4742 (patch) | |
tree | dbd8b3f7bc30a9d40d51ffaa5cd5a93d5eb47359 /build_keyboard.mk | |
parent | 5cc3ab38c9148cd6bc7ccdba176a88fbb95653b1 (diff) | |
download | qmk_firmware-385d49cc39b57e74203e0c1c78c0789d249e4742.tar.gz qmk_firmware-385d49cc39b57e74203e0c1c78c0789d249e4742.zip |
Initial work for consolidation of ChibiOS platform files (#8327)
* Initial work for consolidation of board files and default ChibiOS configs.
* Migrate F401/F411 black pills for testing.
* Add early init bootloader jump flag.
* Add support for I2C in order to use i2c_scanner keymap.
* Add F401/F411 HSE bypass to get things booting.
* Exempt "hooked" ChibiOS conf files from updater script.
* Fix up ordering for bootloader_defs file check.
* Match previous $(KEYBOARD_PATHS) value for Proton-C, updated for all board configs.
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 410870487..b4e1efd9e 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -16,7 +16,6 @@ include common.mk | |||
16 | KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD)) | 16 | KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD)) |
17 | TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP) | 17 | TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP) |
18 | KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE) | 18 | KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE) |
19 | STM32_PATH := quantum/stm32 | ||
20 | 19 | ||
21 | # Force expansion | 20 | # Force expansion |
22 | TARGET := $(TARGET) | 21 | TARGET := $(TARGET) |
@@ -138,7 +137,7 @@ endif | |||
138 | 137 | ||
139 | ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) | 138 | ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) |
140 | TARGET := $(TARGET)_proton_c | 139 | TARGET := $(TARGET)_proton_c |
141 | include $(STM32_PATH)/proton_c.mk | 140 | include platforms/chibios/GENERIC_STM32_F303XC/configs/proton_c.mk |
142 | OPT_DEFS += -DCONVERT_TO_PROTON_C | 141 | OPT_DEFS += -DCONVERT_TO_PROTON_C |
143 | endif | 142 | endif |
144 | 143 | ||
@@ -148,12 +147,6 @@ endif | |||
148 | 147 | ||
149 | include quantum/mcu_selection.mk | 148 | include quantum/mcu_selection.mk |
150 | 149 | ||
151 | ifdef MCU_FAMILY | ||
152 | OPT_DEFS += -DQMK_STM32 | ||
153 | KEYBOARD_PATHS += $(STM32_PATH) | ||
154 | endif | ||
155 | |||
156 | |||
157 | # Find all the C source files to be compiled in subfolders. | 150 | # Find all the C source files to be compiled in subfolders. |
158 | KEYBOARD_SRC := | 151 | KEYBOARD_SRC := |
159 | 152 | ||