summaryrefslogtreecommitdiff
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
parentf55c677ba46a8243f077195ef4f39cde1babf560 (diff)
Add BOOTLOADER_SIZE and remove BOOT_SIZE
- define BOOTLOADER_SIZE in config.h instead of Makefile
-rw-r--r--common/bootloader.c16
-rw-r--r--keyboard/gh60/Makefile.lufa7
-rw-r--r--keyboard/gh60/config.h12
-rw-r--r--keyboard/hhkb/Makefile.iwrap9
-rw-r--r--keyboard/hhkb/Makefile.lufa8
-rw-r--r--keyboard/hhkb/config.h10
-rw-r--r--keyboard/hhkb/config_iwrap.h10
7 files changed, 38 insertions, 34 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)
/*
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index 65b6240efc..2076c919ca 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -107,13 +107,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
#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
-
-
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h
index 3a7a3f97fb..be4d72384e 100644
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -25,12 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER geekhack
#define PRODUCT GH60
-
-
/* message strings */
#define DESCRIPTION t.m.k. keyboard firmware for GH60
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 4096
+
+
/* matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap
index 3ec1a31645..f87df0d2bb 100644
--- a/keyboard/hhkb/Makefile.iwrap
+++ b/keyboard/hhkb/Makefile.iwrap
@@ -49,15 +49,6 @@ 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 75c0310d6e..e8b2414d39 100644
--- a/keyboard/hhkb/Makefile.lufa
+++ b/keyboard/hhkb/Makefile.lufa
@@ -107,14 +107,6 @@ CONSOLE_ENABLE = yes # Console for debug
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
-# 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
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index 72e4d26e92..3bfeb45ed4 100644
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -27,9 +27,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0103
#define MANUFACTURER t.m.k.
#define PRODUCT HHKB mod
+#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
-#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 1024
/* matrix size */
diff --git a/keyboard/hhkb/config_iwrap.h b/keyboard/hhkb/config_iwrap.h
index d50b704d72..2c18cd817a 100644
--- a/keyboard/hhkb/config_iwrap.h
+++ b/keyboard/hhkb/config_iwrap.h
@@ -27,6 +27,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
+/* Boot Section Size in *BYTEs*
+ * Teensy halfKay 512
+ * Teensy++ halfKay 1024
+ * Atmel DFU loader 4096
+ * LUFA bootloader 4096
+ * USBaspLoader 2048
+ */
+#define BOOTLOADER_SIZE 2048
+
+
/* matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 8