From 9fdc27626097ae03b767a09427efc90475d90955 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
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
---
 quantum/quantum.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'quantum')

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 099201596..9232cf441 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -143,7 +143,8 @@ void reset_keyboard(void) {
 #else
   wait_ms(250);
 #endif
-#ifdef CATERINA_BOOTLOADER
+// this is also done later in bootloader.c - not sure if it's neccesary here
+#ifdef BOOTLOADER_CATERINA
   *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
 #endif
   bootloader_jump();
-- 
cgit v1.2.3-24-g4f1b