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/eco | |
| 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/eco')
| -rw-r--r-- | keyboards/eco/config.h | 2 | ||||
| -rw-r--r-- | keyboards/eco/rules.mk | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index 99b057496..f6b78631e 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h | |||
| @@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 31 | #define MATRIX_ROWS 4 | 31 | #define MATRIX_ROWS 4 |
| 32 | #define MATRIX_COLS 14 | 32 | #define MATRIX_COLS 14 |
| 33 | 33 | ||
| 34 | #define CATERINA_BOOTLOADER | ||
| 35 | |||
| 36 | /* COL2ROW or ROW2COL */ | 34 | /* COL2ROW or ROW2COL */ |
| 37 | #define DIODE_DIRECTION COL2ROW | 35 | #define DIODE_DIRECTION COL2ROW |
| 38 | 36 | ||
diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk index 6f4b4fefc..35ee906b1 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk | |||
| @@ -34,18 +34,15 @@ ARCH = AVR8 | |||
| 34 | # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | 34 | # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. |
| 35 | F_USB = $(F_CPU) | 35 | F_USB = $(F_CPU) |
| 36 | 36 | ||
| 37 | # Bootloader | ||
| 38 | # This definition is optional, and if your keyboard supports multiple bootloaders of | ||
| 39 | # different sizes, comment this out, and the correct address will be loaded | ||
| 40 | # automatically (+60). See bootloader.mk for all options. | ||
| 41 | BOOTLOADER = caterina | ||
| 42 | |||
| 37 | # Interrupt driven control endpoint task(+60) | 43 | # Interrupt driven control endpoint task(+60) |
| 38 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | 44 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT |
| 39 | 45 | ||
| 40 | |||
| 41 | # Boot Section Size in *bytes* | ||
| 42 | # Teensy halfKay 512 | ||
| 43 | # Teensy++ halfKay 1024 | ||
| 44 | # Atmel DFU loader 4096 | ||
| 45 | # LUFA bootloader 4096 | ||
| 46 | # USBaspLoader 2048 | ||
| 47 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 | ||
| 48 | |||
| 49 | # Build Options | 46 | # Build Options |
| 50 | # change to "no" to disable the options, or define them in the Makefile in | 47 | # change to "no" to disable the options, or define them in the Makefile in |
| 51 | # the appropriate keymap folder that will get included automatically | 48 | # the appropriate keymap folder that will get included automatically |
