diff options
author | Jack Humbert <jack.humb@gmail.com> | 2017-11-27 23:08:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 23:08:21 -0500 |
commit | 9fdc27626097ae03b767a09427efc90475d90955 (patch) | |
tree | a555c38f1b714af6e2c2c96187552757d08224b9 /build_keyboard.mk | |
parent | 9113f3387a670373919fe62899b0ab27e9d89eba (diff) | |
download | qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.tar.gz qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.zip |
Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump
* fix 32a chips
* make automatic bootloader selection optional
* quantify bootloaders
* fixs #164, speeds up dfu reset
* fix for chips w/o usb
* missing an n
* fix bootloader sizes, use words for addresses
* fix bmini, pearl, and [[ issue, make things quiet
* ignore avr errors on arm for now
* update settings for the light
* document bootloader stuff
* add bootloader title
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index df025714d..cbdaaa010 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -230,6 +230,7 @@ VPATH += $(USER_PATH) | |||
230 | include common_features.mk | 230 | include common_features.mk |
231 | include $(TMK_PATH)/protocol.mk | 231 | include $(TMK_PATH)/protocol.mk |
232 | include $(TMK_PATH)/common.mk | 232 | include $(TMK_PATH)/common.mk |
233 | include bootloader.mk | ||
233 | 234 | ||
234 | SRC += $(TMK_COMMON_SRC) | 235 | SRC += $(TMK_COMMON_SRC) |
235 | OPT_DEFS += $(TMK_COMMON_DEFS) | 236 | OPT_DEFS += $(TMK_COMMON_DEFS) |
@@ -266,10 +267,10 @@ $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC) | |||
266 | $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) | 267 | $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) |
267 | 268 | ||
268 | # Default target. | 269 | # Default target. |
269 | all: build sizeafter | 270 | all: build check-size |
270 | 271 | ||
271 | # Change the build target to build a HEX file or a library. | 272 | # Change the build target to build a HEX file or a library. |
272 | build: elf hex | 273 | build: elf cphex |
273 | #build: elf hex eep lss sym | 274 | #build: elf hex eep lss sym |
274 | #build: lib | 275 | #build: lib |
275 | 276 | ||