summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-10 15:36:07 +0900
committertmk <nobody@nowhere>2013-03-10 17:53:29 +0900
commit51050875b7f1dd5216ba46298f95cf3030a36211 (patch)
tree85c0c37023033f851c8a18e5b407b4845537c029 /common
parentf55c677ba46a8243f077195ef4f39cde1babf560 (diff)
Add BOOTLOADER_SIZE and remove BOOT_SIZE
- define BOOTLOADER_SIZE in config.h instead of Makefile
Diffstat (limited to 'common')
-rw-r--r--common/bootloader.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/common/bootloader.c b/common/bootloader.c
index 023220414b..f9802d36c5 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -12,16 +12,18 @@
/* Boot Section Size in *BYTEs*
- * Teensy halfKay 512
- * Teensy++ halfKay 1024
- * Atmel DFU loader 4096
- * LUFA bootloader 4096
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
*/
-#ifndef BOOT_SIZE
-#define BOOT_SIZE 512
+#ifndef BOOTLOADER_SIZE
+#warn To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
#endif
+
#define FLASH_SIZE (FLASHEND + 1L)
-#define BOOTLOADER_START (FLASH_SIZE - BOOT_SIZE)
+#define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE)
/*