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 /keyboards/levinson | |
| 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 'keyboards/levinson')
| -rw-r--r-- | keyboards/levinson/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/levinson/rev2/config.h | 3 | ||||
| -rw-r--r-- | keyboards/levinson/rules.mk | 15 |
3 files changed, 6 insertions, 14 deletions
diff --git a/keyboards/levinson/rev1/config.h b/keyboards/levinson/rev1/config.h index 7c8b9b0b92..ddccbc47a9 100644 --- a/keyboards/levinson/rev1/config.h +++ b/keyboards/levinson/rev1/config.h @@ -38,8 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D7, E6, B4, B5 } #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 } -#define CATERINA_BOOTLOADER - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/levinson/rev2/config.h b/keyboards/levinson/rev2/config.h index 27d451a3b2..51ae5cd3c7 100644 --- a/keyboards/levinson/rev2/config.h +++ b/keyboards/levinson/rev2/config.h @@ -38,9 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D4, D7, E6, B4 } #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -#define CATERINA_BOOTLOADER - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/levinson/rules.mk b/keyboards/levinson/rules.mk index 0ca19e9a00..8e67497f4b 100644 --- a/keyboards/levinson/rules.mk +++ b/keyboards/levinson/rules.mk @@ -40,18 +40,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(+60) 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 # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically |