diff --git a/converter/m0110_usb/Makefile.lufa b/converter/m0110_usb/Makefile.lufa index 028bdf9331..8c12ca7834 100644 --- a/converter/m0110_usb/Makefile.lufa +++ b/converter/m0110_usb/Makefile.lufa @@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 diff --git a/converter/pc98_usb/Makefile b/converter/pc98_usb/Makefile index 2575d86672..71c7858f37 100644 --- a/converter/pc98_usb/Makefile +++ b/converter/pc98_usb/Makefile @@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Search Path diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb index d449e1e40f..1bb44f8875 100644 --- a/converter/ps2_usb/Makefile.vusb +++ b/converter/ps2_usb/Makefile.vusb @@ -87,7 +87,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBasp 2048 -OPT_DEFS += -DBOOT_SIZE=2048 +OPT_DEFS += -DBOOTLOADER_SIZE=2048 # Search Path diff --git a/converter/sun_usb/Makefile b/converter/sun_usb/Makefile index c6e8390cc9..73a83e93f8 100644 --- a/converter/sun_usb/Makefile +++ b/converter/sun_usb/Makefile @@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Search Path diff --git a/converter/sun_usb/config.h b/converter/sun_usb/config.h index 32303cd32b..cfd39cd513 100644 --- a/converter/sun_usb/config.h +++ b/converter/sun_usb/config.h @@ -39,15 +39,6 @@ along with this program. If not, see . /* legacy keymap support */ #define USE_LEGACY_KEYMAP -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - /* Serial(USART) configuration * asynchronous, negative logic, 1200baud, no flow control diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile index 41a64e4643..13f77ca9b7 100644 --- a/converter/usb_usb/Makefile +++ b/converter/usb_usb/Makefile @@ -99,7 +99,7 @@ CONSOLE_ENABLE = yes # Console for debug # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -#OPT_DEFS += -DBOOT_SIZE=4096 +#OPT_DEFS += -DBOOTLOADER_SIZE=4096 diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 278f966def..ad7d219e3e 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa @@ -96,11 +96,13 @@ F_USB = $(F_CPU) #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -# Boot Section Size in bytes +# Boot Section Size in *bytes* # Teensy halfKay 512 +# Teensy++ halfKay 1024 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options @@ -113,7 +115,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support # Optimize size but this may cause error "relocation truncated to fit" diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index c12334fcaf..0ea33ea304 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -69,11 +69,11 @@ MCU = atmega32u4 F_CPU = 16000000 -# Boot Section Size in bytes +# Boot Section Size in *bytes* # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 7fe28470dd..fbe587081b 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -47,15 +47,6 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - /* diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa index a626d476c8..0d103c8766 100644 --- a/keyboard/hbkb/Makefile.lufa +++ b/keyboard/hbkb/Makefile.lufa @@ -108,7 +108,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Search Path diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h index b31a865382..9db8c2c4d4 100644 --- a/keyboard/hbkb/config.h +++ b/keyboard/hbkb/config.h @@ -48,13 +48,4 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ ) -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - #endif diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h index e34d9a6ba1..6e26edbefc 100644 --- a/keyboard/hhkb/config.h +++ b/keyboard/hhkb/config.h @@ -30,16 +30,6 @@ along with this program. If not, see . #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 */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboard/hhkb/config_iwrap.h b/keyboard/hhkb/config_iwrap.h index 7a4ec37118..d459a5efb5 100644 --- a/keyboard/hhkb/config_iwrap.h +++ b/keyboard/hhkb/config_iwrap.h @@ -27,16 +27,6 @@ along with this program. If not, see . #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 diff --git a/keyboard/hid_liber/Makefile.lufa b/keyboard/hid_liber/Makefile.lufa index 498f17ed78..39a4d1e0f6 100644 --- a/keyboard/hid_liber/Makefile.lufa +++ b/keyboard/hid_liber/Makefile.lufa @@ -101,7 +101,7 @@ F_USB = $(F_CPU) # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options diff --git a/keyboard/hid_liber/Makefile.pjrc b/keyboard/hid_liber/Makefile.pjrc index 70ad47f29a..1ef8741bfd 100644 --- a/keyboard/hid_liber/Makefile.pjrc +++ b/keyboard/hid_liber/Makefile.pjrc @@ -75,7 +75,7 @@ F_CPU = 16000000 # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options diff --git a/keyboard/hid_liber/config.h b/keyboard/hid_liber/config.h index 17fc2ed892..9ee3804688 100644 --- a/keyboard/hid_liber/config.h +++ b/keyboard/hid_liber/config.h @@ -46,15 +46,6 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - // TODO: configurable #define DEBUG_LED 0 #define DEBUG_LED_CONFIG diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa index f0acf76713..359a8c246d 100644 --- a/keyboard/macway/Makefile.lufa +++ b/keyboard/macway/Makefile.lufa @@ -109,7 +109,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -#OPT_DEFS += -DBOOT_SIZE=4096 +#OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Search Path diff --git a/keyboard/macway/config.h b/keyboard/macway/config.h index b88f898e2c..74093405ad 100644 --- a/keyboard/macway/config.h +++ b/keyboard/macway/config.h @@ -51,15 +51,6 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - /* PS/2 mouse */ #ifdef PS2_MOUSE_ENABLE # define PS2_CLOCK_PORT PORTF diff --git a/keyboard/phantom/Makefile.lufa b/keyboard/phantom/Makefile.lufa index 641d8c52a8..c8c13da094 100644 --- a/keyboard/phantom/Makefile.lufa +++ b/keyboard/phantom/Makefile.lufa @@ -108,7 +108,7 @@ CONSOLE_ENABLE = yes # Console for debug # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 -OPT_DEFS += -DBOOT_SIZE=512 +OPT_DEFS += -DBOOTLOADER_SIZE=512 # Search Path diff --git a/keyboard/phantom/config.h b/keyboard/phantom/config.h index a5d472979a..18bd130419 100644 --- a/keyboard/phantom/config.h +++ b/keyboard/phantom/config.h @@ -47,15 +47,6 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -/* Boot Section Size in *BYTEs* - * Teensy halfKay 512 - * Teensy++ halfKay 1024 - * Atmel DFU loader 4096 - * LUFA bootloader 4096 - * USBaspLoader 2048 - */ -#define BOOTLOADER_SIZE 4096 - // TODO: configurable #define DEBUG_LED 0 #define DEBUG_LED_CONFIG