diff options
| author | tmk <nobody@nowhere> | 2013-03-10 15:36:07 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-10 17:53:29 +0900 |
| commit | 51050875b7f1dd5216ba46298f95cf3030a36211 (patch) | |
| tree | 85c0c37023033f851c8a18e5b407b4845537c029 /keyboard/hhkb | |
| parent | f55c677ba46a8243f077195ef4f39cde1babf560 (diff) | |
Add BOOTLOADER_SIZE and remove BOOT_SIZE
- define BOOTLOADER_SIZE in config.h instead of Makefile
Diffstat (limited to 'keyboard/hhkb')
| -rw-r--r-- | keyboard/hhkb/Makefile.iwrap | 9 | ||||
| -rw-r--r-- | keyboard/hhkb/Makefile.lufa | 8 | ||||
| -rw-r--r-- | keyboard/hhkb/config.h | 10 | ||||
| -rw-r--r-- | keyboard/hhkb/config_iwrap.h | 10 |
4 files changed, 19 insertions, 18 deletions
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 |