robinson/tmk_keyboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix watchdog in bootloader jump

Browse Source 
- disable watchdog after watchdog reset
- clear WDRF after watchdog reset
This commit is contained in:
tmk 2013-03-10 15:05:28 +09:00
parent 1385058fc2
commit f55c677ba4
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/bootloader.c
View File

@ -11,15 +11,16 @@
#endif #endif
/* Boot Section Size in bytes /* Boot Section Size in *BYTEs*
* Teensy halfKay 512 * Teensy halfKay 512
* Atmel DFU loader 4096 * Teensy++ halfKay 1024
* LUFA bootloader 4096 * Atmel DFU loader 4096
* LUFA bootloader 4096
*/ */
#ifndef BOOT_SIZE #ifndef BOOT_SIZE
#define BOOT_SIZE 512 #define BOOT_SIZE 512
#endif #endif
#define FLASH_SIZE (FLASHEND + 1) #define FLASH_SIZE (FLASHEND + 1L)
#define BOOTLOADER_START (FLASH_SIZE - BOOT_SIZE) #define BOOTLOADER_START (FLASH_SIZE - BOOT_SIZE)
@ -58,13 +59,15 @@ void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, sec
void bootloader_jump_after_watchdog_reset(void) void bootloader_jump_after_watchdog_reset(void)
{ {
if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) { if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
// This makes custom USBasploader come up.
MCUSR = 0;
#endif
reset_key = 0; reset_key = 0;
// My custom USBasploader requires this to come up.
MCUSR = 0;
// Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
MCUSR &= ~(1<<WDRF);
wdt_disable();
((void (*)(void))BOOTLOADER_START)(); ((void (*)(void))BOOTLOADER_START)();
} }
} }
@ -138,4 +141,4 @@ void bootloader_jump(void) {
// start Bootloader // start Bootloader
((void (*)(void))BOOTLOADER_START)(); ((void (*)(void))BOOTLOADER_START)();
} }
#endif #endif

9
keyboard/hhkb/Makefile.iwrap
View File

@ -49,6 +49,15 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
#NKRO_ENABLE = yes # USB Nkey Rollover #NKRO_ENABLE = yes # USB Nkey Rollover
# Boot Section Size in *BYTEs*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOT_SIZE=2048
#---------------- Programming Options -------------------------- #---------------- Programming Options --------------------------
AVRDUDE = avrdude AVRDUDE = avrdude

11
keyboard/hhkb/Makefile.lufa
View File

@ -107,11 +107,12 @@ CONSOLE_ENABLE = yes # Console for debug
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
# Boot Section Size in bytes # Boot Section Size in *BYTEs*
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Teensy++ halfKay 1024
# LUFA bootloader 4096 # Atmel DFU loader 4096
#OPT_DEFS += -DBOOT_SIZE=4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=1024
# Search Path # Search Path