From: tmk <hasu@tmk-kbd.com>
Date: Wed, 18 Sep 2019 05:14:25 +0000 (+0900)
Subject: core: Remove unneeded code in bootloader_jump
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=inline;h=bc821b79d09dfc1d3747b1f7a9937d852404d12b;p=max%2Ftmk_keyboard.git

core: Remove unneeded code in bootloader_jump
---

diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c
index 2a898f8c..8a1bec06 100644
--- a/tmk_core/common/avr/bootloader.c
+++ b/tmk_core/common/avr/bootloader.c
@@ -92,7 +92,6 @@ void bootloader_jump(void) {
 #ifdef PROTOCOL_LUFA
     USB_Disable();
     cli();
-    _delay_ms(2000);
 #endif
 
 #ifdef PROTOCOL_PJRC
@@ -125,11 +124,10 @@ void bootloader_jump_after_watchdog_reset(void)
     if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
         reset_key = 0;
 
-        // My custom USBasploader requires this to come up.
+        // some of bootloaders may need to preseve?
         MCUSR = 0;
 
-        // Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
-        MCUSR &= ~(1<<WDRF);
+        // disable watchdog timer
         wdt_disable();
 
 #ifndef NO_BOOTLOADER_CATERINA_BOOTKEY