diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-28 05:08:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 05:08:21 +0100 |
| commit | 9fdc27626097ae03b767a09427efc90475d90955 (patch) | |
| tree | a555c38f1b714af6e2c2c96187552757d08224b9 /keyboards/converter/usb_usb | |
| parent | 9113f3387a670373919fe62899b0ab27e9d89eba (diff) | |
| download | qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.tar.gz qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.tar.xz | |
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 'keyboards/converter/usb_usb')
| -rw-r--r-- | keyboards/converter/usb_usb/ble/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/converter/usb_usb/rules.mk | 16 |
2 files changed, 6 insertions, 11 deletions
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk index c951780e2..16090962d 100644 --- a/keyboards/converter/usb_usb/ble/rules.mk +++ b/keyboards/converter/usb_usb/ble/rules.mk @@ -1,4 +1,3 @@ BLUETOOTH = AdafruitBLE ADAFRUIT_BLE_ENABLE = yes -OPT_DEFS += -DCATERINA_BOOTLOADER F_CPU = 8000000 diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index b0e07c764..7a8f24bb4 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -43,19 +43,15 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) +# Bootloader +# This definition is optional, and if your keyboard supports multiple bootloaders of +# different sizes, comment this out, and the correct address will be loaded +# automatically (+60). See bootloader.mk for all options. +BOOTLOADER = caterina + # Interrupt driven control endpoint task OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # comment out to disable the options. # |