From 9fdc27626097ae03b767a09427efc90475d90955 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 27 Nov 2017 23:08:21 -0500 Subject: 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 --- keyboards/gherkin/keymaps/mjt/config.h | 2 -- keyboards/gherkin/rules.mk | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'keyboards/gherkin') diff --git a/keyboards/gherkin/keymaps/mjt/config.h b/keyboards/gherkin/keymaps/mjt/config.h index 9c9f038389..bb59ec213d 100644 --- a/keyboards/gherkin/keymaps/mjt/config.h +++ b/keyboards/gherkin/keymaps/mjt/config.h @@ -52,8 +52,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } #define MATRIX_COL_PINS { B4, E6, D7, F6, D4, D0 } -#define CATERINA_BOOTLOADER - #define UNUSED_PINS /* COL2ROW or ROW2COL */ diff --git a/keyboards/gherkin/rules.mk b/keyboards/gherkin/rules.mk index 6bb9edb35a..530898bd78 100644 --- a/keyboards/gherkin/rules.mk +++ b/keyboards/gherkin/rules.mk @@ -33,14 +33,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* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # comment out to disable the options. # -- cgit v1.2.3