From 03e1515a51fd8013d679f02ddddb81e57ff43332 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 27 Oct 2011 11:36:10 -0400 Subject: [PATCH] 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. --- hardware/arduino/boards.txt | 4 ++-- hardware/arduino/cores/arduino/CDC.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt index 3e99f81f9..aa5c70dc9 100644 --- a/hardware/arduino/boards.txt +++ b/hardware/arduino/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/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp index 14a0eaee7..b8df09f4e 100644 --- a/hardware/arduino/cores/arduino/CDC.cpp +++ b/hardware/arduino/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