From 353a9b56e6caee853d3f808d2bfedf07056b4518 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 29 Mar 2013 11:31:21 +0900 Subject: Fix BOOTLOADER_SIZE setting --- keyboard/gh60/Makefile.lufa | 7 ++++--- keyboard/gh60/Makefile.pjrc | 4 ++-- keyboard/gh60/config.h | 9 --------- 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'keyboard/gh60') diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 278f966de..ad7d219e3 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 c12334fca..0ea33ea30 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 7fe28470d..fbe587081 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 - /* -- cgit v1.2.3