~ruther/qmk_firmware

353a9b56e6caee853d3f808d2bfedf07056b4518 — tmk 12 years ago 41bf920
Fix BOOTLOADER_SIZE setting
M converter/m0110_usb/Makefile.lufa => converter/m0110_usb/Makefile.lufa +1 -1
@@ 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




M converter/pc98_usb/Makefile => converter/pc98_usb/Makefile +1 -1
@@ 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

M converter/ps2_usb/Makefile.vusb => converter/ps2_usb/Makefile.vusb +1 -1
@@ 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

M converter/sun_usb/Makefile => converter/sun_usb/Makefile +1 -1
@@ 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

M converter/sun_usb/config.h => converter/sun_usb/config.h +0 -9
@@ 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

M converter/usb_usb/Makefile => converter/usb_usb/Makefile +1 -1
@@ 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




M keyboard/gh60/Makefile.lufa => keyboard/gh60/Makefile.lufa +4 -3
@@ 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"

M keyboard/gh60/Makefile.pjrc => keyboard/gh60/Makefile.pjrc +2 -2
@@ 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

M keyboard/gh60/config.h => keyboard/gh60/config.h +0 -9
@@ 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



/*

M keyboard/hbkb/Makefile.lufa => keyboard/hbkb/Makefile.lufa +1 -1
@@ 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

M keyboard/hbkb/config.h => keyboard/hbkb/config.h +0 -9
@@ 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

M keyboard/hhkb/config.h => keyboard/hhkb/config.h +0 -10
@@ 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

M keyboard/hhkb/config_iwrap.h => keyboard/hhkb/config_iwrap.h +0 -10
@@ 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

M keyboard/hid_liber/Makefile.lufa => keyboard/hid_liber/Makefile.lufa +1 -1
@@ 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

M keyboard/hid_liber/Makefile.pjrc => keyboard/hid_liber/Makefile.pjrc +1 -1
@@ 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

M keyboard/hid_liber/config.h => keyboard/hid_liber/config.h +0 -9
@@ 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

M keyboard/macway/Makefile.lufa => keyboard/macway/Makefile.lufa +1 -1
@@ 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

M keyboard/macway/config.h => keyboard/macway/config.h +0 -9
@@ 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

M keyboard/phantom/Makefile.lufa => keyboard/phantom/Makefile.lufa +1 -1
@@ 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

M keyboard/phantom/config.h => keyboard/phantom/config.h +0 -9
@@ 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