diff options
| author | tmk <nobody@nowhere> | 2013-03-29 11:31:21 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-29 11:31:21 +0900 |
| commit | 353a9b56e6caee853d3f808d2bfedf07056b4518 (patch) | |
| tree | 462718683391051273e9e9b0a0b5fa2c4763215f /keyboard/gh60 | |
| parent | 41bf9204127842e852ce4fa0ad35998a3b3d79c5 (diff) | |
| download | qmk_firmware-353a9b56e6caee853d3f808d2bfedf07056b4518.tar.gz qmk_firmware-353a9b56e6caee853d3f808d2bfedf07056b4518.zip | |
Fix BOOTLOADER_SIZE setting
Diffstat (limited to 'keyboard/gh60')
| -rw-r--r-- | keyboard/gh60/Makefile.lufa | 7 | ||||
| -rw-r--r-- | keyboard/gh60/Makefile.pjrc | 4 | ||||
| -rw-r--r-- | keyboard/gh60/config.h | 9 |
3 files changed, 6 insertions, 14 deletions
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) | |||
| 96 | #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | 96 | #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT |
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | # Boot Section Size in bytes | 99 | # Boot Section Size in *bytes* |
| 100 | # Teensy halfKay 512 | 100 | # Teensy halfKay 512 |
| 101 | # Teensy++ halfKay 1024 | ||
| 101 | # Atmel DFU loader 4096 | 102 | # Atmel DFU loader 4096 |
| 102 | # LUFA bootloader 4096 | 103 | # LUFA bootloader 4096 |
| 103 | OPT_DEFS += -DBOOT_SIZE=4096 | 104 | # USBaspLoader 2048 |
| 105 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 | ||
| 104 | 106 | ||
| 105 | 107 | ||
| 106 | # Build Options | 108 | # Build Options |
| @@ -113,7 +115,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| 113 | COMMAND_ENABLE = yes # Commands for debug and configuration | 115 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 114 | SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 116 | SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
| 115 | #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | 117 | #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA |
| 116 | #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support | ||
| 117 | 118 | ||
| 118 | 119 | ||
| 119 | # Optimize size but this may cause error "relocation truncated to fit" | 120 | # 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 | |||
| 69 | F_CPU = 16000000 | 69 | F_CPU = 16000000 |
| 70 | 70 | ||
| 71 | 71 | ||
| 72 | # Boot Section Size in bytes | 72 | # Boot Section Size in *bytes* |
| 73 | # Teensy halfKay 512 | 73 | # Teensy halfKay 512 |
| 74 | # Atmel DFU loader 4096 | 74 | # Atmel DFU loader 4096 |
| 75 | # LUFA bootloader 4096 | 75 | # LUFA bootloader 4096 |
| 76 | OPT_DEFS += -DBOOT_SIZE=4096 | 76 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 |
| 77 | 77 | ||
| 78 | 78 | ||
| 79 | # Build Options | 79 | # 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 <http://www.gnu.org/licenses/>. | |||
| 47 | keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ | 47 | keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ |
| 48 | ) | 48 | ) |
| 49 | 49 | ||
| 50 | /* Boot Section Size in *BYTEs* | ||
| 51 | * Teensy halfKay 512 | ||
| 52 | * Teensy++ halfKay 1024 | ||
| 53 | * Atmel DFU loader 4096 | ||
| 54 | * LUFA bootloader 4096 | ||
| 55 | * USBaspLoader 2048 | ||
| 56 | */ | ||
| 57 | #define BOOTLOADER_SIZE 4096 | ||
| 58 | |||
| 59 | 50 | ||
| 60 | 51 | ||
| 61 | /* | 52 | /* |
