aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-10-27 11:36:10 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-10-27 11:36:10 -0400
commit415a5e119d11394fc7e7365ff5b7c64a50ef7f64 (patch)
tree126e6f69750cb094ea23c55c89a088099e8f2f22
parent2b13fd3b4091049ebdf295986d834de4c9ea3c32 (diff)
changes in core and boards.txt to support new bootloader
old bootloader could fit in only 2 kB of flash. new version has to have a 4 kB block - jump-to address and boards.txt must reflect this.
-rw-r--r--boards.txt4
-rw-r--r--cores/arduino/CDC.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/boards.txt b/boards.txt
index 3e99f81..aa5c70d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -146,10 +146,10 @@ mega.build.variant=mega
leonardo.name=Arduino Leonardo
leonardo.upload.protocol=arduino
-leonardo.upload.maximum_size=30720
+leonardo.upload.maximum_size=28672
leonardo.upload.speed=1200
leonardo.bootloader.low_fuses=0xde
-leonardo.bootloader.high_fuses=0xda
+leonardo.bootloader.high_fuses=0xd8
leonardo.bootloader.extended_fuses=0xcb
leonardo.bootloader.path=nuevo_diskloader
leonardo.bootloader.file=DiskLoader.hex
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index 14a0eae..b8df09f 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -27,7 +27,7 @@ void Reboot()
{
USB.detach();
cli();
- asm volatile("jmp 0x7800"); // jump to bootloader - DiskLoader takes up last 2 kB
+ asm volatile("jmp 0x7000"); // jump to bootloader - DiskLoader lives in the last 4kB of Flash
}
typedef struct