diff options
author | tmk <nobody@nowhere> | 2013-03-10 15:05:28 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2013-03-10 15:06:33 +0900 |
commit | f55c677ba46a8243f077195ef4f39cde1babf560 (patch) | |
tree | eb1803049580c109674ed78911f0e9b40549a4dc /keyboard/hhkb | |
parent | 1385058fc21f80347c7afd2b818e38795ce9d55a (diff) | |
download | firmware-f55c677ba46a8243f077195ef4f39cde1babf560.tar.gz firmware-f55c677ba46a8243f077195ef4f39cde1babf560.tar.bz2 firmware-f55c677ba46a8243f077195ef4f39cde1babf560.zip |
Fix watchdog in bootloader jump
- disable watchdog after watchdog reset
- clear WDRF after watchdog reset
Diffstat (limited to 'keyboard/hhkb')
-rw-r--r-- | keyboard/hhkb/Makefile.iwrap | 9 | ||||
-rw-r--r-- | keyboard/hhkb/Makefile.lufa | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap index f87df0d2b..3ec1a3164 100644 --- a/keyboard/hhkb/Makefile.iwrap +++ b/keyboard/hhkb/Makefile.iwrap @@ -49,6 +49,15 @@ EXTRAKEY_ENABLE = yes # Audio control and System control #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 -------------------------- AVRDUDE = avrdude diff --git a/keyboard/hhkb/Makefile.lufa b/keyboard/hhkb/Makefile.lufa index afd413d01..75c0310d6 100644 --- a/keyboard/hhkb/Makefile.lufa +++ b/keyboard/hhkb/Makefile.lufa @@ -107,11 +107,12 @@ CONSOLE_ENABLE = yes # Console for debug #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -#OPT_DEFS += -DBOOT_SIZE=4096 +# Boot Section Size in *BYTEs* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +OPT_DEFS += -DBOOT_SIZE=1024 # Search Path |