Fix BOOTLOADER_SIZE setting

This commit is contained in:
tmk 2013-03-29 11:31:21 +09:00
parent 41bf920412
commit 353a9b56e6
20 changed files with 16 additions and 89 deletions

View File

@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096

View File

@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path # Search Path

View File

@ -87,7 +87,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
# USBasp 2048 # USBasp 2048
OPT_DEFS += -DBOOT_SIZE=2048 OPT_DEFS += -DBOOTLOADER_SIZE=2048
# Search Path # Search Path

View File

@ -69,7 +69,7 @@ CONSOLE_ENABLE = yes # Console for debug
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path # Search Path

View File

@ -39,15 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* legacy keymap support */ /* legacy keymap support */
#define USE_LEGACY_KEYMAP #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 /* Serial(USART) configuration
* asynchronous, negative logic, 1200baud, no flow control * asynchronous, negative logic, 1200baud, no flow control

View File

@ -99,7 +99,7 @@ CONSOLE_ENABLE = yes # Console for debug
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
#OPT_DEFS += -DBOOT_SIZE=4096 #OPT_DEFS += -DBOOTLOADER_SIZE=4096

View File

@ -96,11 +96,13 @@ F_USB = $(F_CPU)
#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 # USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
@ -113,7 +115,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #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" # Optimize size but this may cause error "relocation truncated to fit"

View File

@ -69,11 +69,11 @@ MCU = atmega32u4
F_CPU = 16000000 F_CPU = 16000000
# Boot Section Size in bytes # Boot Section Size in *bytes*
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options

View File

@ -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)) \ 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
/* /*

View File

@ -108,7 +108,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path # Search Path

View File

@ -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)) \ 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 #endif

View File

@ -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 #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 */ /* matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 8 #define MATRIX_COLS 8

View File

@ -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 #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 */ /* matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 8 #define MATRIX_COLS 8

View File

@ -101,7 +101,7 @@ F_USB = $(F_CPU)
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options

View File

@ -75,7 +75,7 @@ F_CPU = 16000000
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options

View File

@ -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)) \ 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 // TODO: configurable
#define DEBUG_LED 0 #define DEBUG_LED 0
#define DEBUG_LED_CONFIG #define DEBUG_LED_CONFIG

View File

@ -109,7 +109,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
#OPT_DEFS += -DBOOT_SIZE=4096 #OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path # Search Path

View File

@ -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)) \ 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 */ /* PS/2 mouse */
#ifdef PS2_MOUSE_ENABLE #ifdef PS2_MOUSE_ENABLE
# define PS2_CLOCK_PORT PORTF # define PS2_CLOCK_PORT PORTF

View File

@ -108,7 +108,7 @@ CONSOLE_ENABLE = yes # Console for debug
# Teensy halfKay 512 # Teensy halfKay 512
# Atmel DFU loader 4096 # Atmel DFU loader 4096
# LUFA bootloader 4096 # LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=512 OPT_DEFS += -DBOOTLOADER_SIZE=512
# Search Path # Search Path

View File

@ -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)) \ 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 // TODO: configurable
#define DEBUG_LED 0 #define DEBUG_LED 0
#define DEBUG_LED_CONFIG #define DEBUG_LED_CONFIG