Fix BOOTLOADER_SIZE setting

diff --git a/converter/m0110_usb/Makefile.lufa b/converter/m0110_usb/Makefile.lufa
index 028bdf93317a31b7c68c97474c93007eeb05c942..8c12ca783473d570c45589fcce48260705f40034 100644 (file)
--- 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 2575d86672f92892c120362b0c12e7be0c2a6197..71c7858f37843617e1f88f8d70ab9a2ec11f1461 100644 (file)
--- 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 d449e1e40f3eb0cf548f759cb9b4345a0b74d2c0..1bb44f8875d7c5e03035bf77825f199e7121aef6 100644 (file)
--- 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 c6e8390cc99d5fd024c60f5c30dc7d23641d18c0..73a83e93f821324e27134aad808683943c22ade1 100644 (file)
--- 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 32303cd32b0305bc292b8d8f80518e21ed0b9ef9..cfd39cd513a68fcb44789f5399b384764882538d 100644 (file)
--- a/converter/sun_usb/config.h
+++ b/converter/sun_usb/config.h
@@ -39,15 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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 41a64e46433e0ea96fc9bd5b3ff961f8e65636a4..13f77ca9b7db668c9068ba598f2503ecb581f4d0 100644 (file)
--- 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 278f966def808b521bc04360561e66c39d4b6934..ad7d219e3ed8cc7f1bcaff526c41bb9cbbf0428b 100644 (file)
--- 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 c12334fcafc06ad011e2f20088130089fdec676d..0ea33ea304074fe3992319cb6b977af0eb6f590a 100644 (file)
--- 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 7fe28470dd9325580e175afe7da57e93e8f99212..fbe587081b62661a42a76aefbcd0d97e4afaddb7 100644 (file)
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -47,15 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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 a626d476c8733af9d322f7776c41baa41cb392ff..0d103c87666b37056c36e19f36aaf8d7b5280212 100644 (file)
--- 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 b31a865382ceefe419af67ba271b85b43a4c607c..9db8c2c4d4d5ddff263bdf2842af2b3e69ad5f81 100644 (file)
--- a/keyboard/hbkb/config.h
+++ b/keyboard/hbkb/config.h
@@ -48,13 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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 e34d9a6ba13384d2362526c8a4ac9a94ec8a6090..6e26edbefcd83a7b9e6040ec1008357a85eecb89 100644 (file)
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -30,16 +30,6 @@ 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 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 7a4ec3711858e2cba758b513a0c42bca86ed5c55..d459a5efb553f51b6efac4d6ef8687046e88b3f9 100644 (file)
--- a/keyboard/hhkb/config_iwrap.h
+++ b/keyboard/hhkb/config_iwrap.h
@@ -27,16 +27,6 @@ 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

diff --git a/keyboard/hid_liber/Makefile.lufa b/keyboard/hid_liber/Makefile.lufa
index 498f17ed7800152617220ed03174efa490dce034..39a4d1e0f6db1b8a09d1969dbb250f0af06dc166 100644 (file)
--- 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 70ad47f29a4a7967b1d587f0f9bf8344a456f4e0..1ef8741bfdfaa368f9f1e9c46986ee6325f3184c 100644 (file)
--- 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 17fc2ed8929d6b71e6b37a8bef9505e17218ada6..9ee38046884c424a031a34312410c56b417474b3 100644 (file)
--- a/keyboard/hid_liber/config.h
+++ b/keyboard/hid_liber/config.h
@@ -46,15 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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 f0acf76713b4cc4beb3e058d9480db7d6f0744a5..359a8c246d155b163e200a7cf2e5dacc1cd1978f 100644 (file)
--- 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 b88f898e2c3c23e0c1a59ee7294bc8d16a8d4697..74093405ad6a96819b0a94ee458e02c37b5b4437 100644 (file)
--- a/keyboard/macway/config.h
+++ b/keyboard/macway/config.h
@@ -51,15 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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 641d8c52a8596752e92295bd075bbc03c5e5433c..c8c13da09410e4325da37326ecc01fe96e449952 100644 (file)
--- 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 a5d472979ad8a9e5ab77a74a8bb1771dab2ae581..18bd130419bcc92114be586ad0e1f5f7573235a0 100644 (file)
--- a/keyboard/phantom/config.h
+++ b/keyboard/phantom/config.h
@@ -47,15 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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