Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / bootloader.c

diff --git a/common/bootloader.c b/common/bootloader.c
index f9802d36c52a0bc70e8da18a5712d3fb984b8fe7..cda295b1811e92f90baea342084b37a07139bcc1 100644 (file)
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -19,7 +19,8 @@
  *   USBaspLoader        2048
  */
 #ifndef BOOTLOADER_SIZE
-#warn To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
+#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
+#define BOOTLOADER_SIZE     4096
 #endif
 
 #define FLASH_SIZE          (FLASHEND + 1L)
@@ -70,7 +71,8 @@ void bootloader_jump_after_watchdog_reset(void)
         MCUSR &= ~(1<<WDRF);
         wdt_disable();
 
-        ((void (*)(void))BOOTLOADER_START)();
+        // This is compled into 'icall', address should be in word unit, not byte.
+        ((void (*)(void))(BOOTLOADER_START/2))();
     }
 }
 
@@ -140,7 +142,7 @@ void bootloader_jump(void) {
     ADCSRA = 0; TWCR = 0; UCSR0B = 0;
 #endif
 
-    // start Bootloader
-    ((void (*)(void))BOOTLOADER_START)();
+    // This is compled into 'icall', address should be in word unit, not byte.
+    ((void (*)(void))(BOOTLOADER_START/2))();
 }
 #endif