Browse Source

Fix BOOTLOADER_SIZE setting

pull/12/head
tmk 11 years ago
parent
commit
353a9b56e6
20 changed files with 16 additions and 89 deletions
  1. +1
    -1
      converter/m0110_usb/Makefile.lufa
  2. +1
    -1
      converter/pc98_usb/Makefile
  3. +1
    -1
      converter/ps2_usb/Makefile.vusb
  4. +1
    -1
      converter/sun_usb/Makefile
  5. +0
    -9
      converter/sun_usb/config.h
  6. +1
    -1
      converter/usb_usb/Makefile
  7. +4
    -3
      keyboard/gh60/Makefile.lufa
  8. +2
    -2
      keyboard/gh60/Makefile.pjrc
  9. +0
    -9
      keyboard/gh60/config.h
  10. +1
    -1
      keyboard/hbkb/Makefile.lufa
  11. +0
    -9
      keyboard/hbkb/config.h
  12. +0
    -10
      keyboard/hhkb/config.h
  13. +0
    -10
      keyboard/hhkb/config_iwrap.h
  14. +1
    -1
      keyboard/hid_liber/Makefile.lufa
  15. +1
    -1
      keyboard/hid_liber/Makefile.pjrc
  16. +0
    -9
      keyboard/hid_liber/config.h
  17. +1
    -1
      keyboard/macway/Makefile.lufa
  18. +0
    -9
      keyboard/macway/config.h
  19. +1
    -1
      keyboard/phantom/Makefile.lufa
  20. +0
    -9
      keyboard/phantom/config.h

+ 1
- 1
converter/m0110_usb/Makefile.lufa View File

@ -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


+ 1
- 1
converter/pc98_usb/Makefile View File

@ -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


+ 1
- 1
converter/ps2_usb/Makefile.vusb View File

@ -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


+ 1
- 1
converter/sun_usb/Makefile View File

@ -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


+ 0
- 9
converter/sun_usb/config.h View File

@ -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


+ 1
- 1
converter/usb_usb/Makefile View File

@ -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


+ 4
- 3
keyboard/gh60/Makefile.lufa View File

@ -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"


+ 2
- 2
keyboard/gh60/Makefile.pjrc View File

@ -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


+ 0
- 9
keyboard/gh60/config.h 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)) \
)
/* Boot Section Size in *BYTEs*
* Teensy halfKay 512
* Teensy++ halfKay 1024
* Atmel DFU loader 4096
* LUFA bootloader 4096
* USBaspLoader 2048
*/
#define BOOTLOADER_SIZE 4096
/*


+ 1
- 1
keyboard/hbkb/Makefile.lufa View File

@ -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


+ 0
- 9
keyboard/hbkb/config.h 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)) \
)
/* 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

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


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


+ 1
- 1
keyboard/hid_liber/Makefile.lufa View File

@ -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


+ 1
- 1
keyboard/hid_liber/Makefile.pjrc View File

@ -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


+ 0
- 9
keyboard/hid_liber/config.h 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)) \
)
/* 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


+ 1
- 1
keyboard/macway/Makefile.lufa View File

@ -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


+ 0
- 9
keyboard/macway/config.h 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)) \
)
/* 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


+ 1
- 1
keyboard/phantom/Makefile.lufa View File

@ -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


+ 0
- 9
keyboard/phantom/config.h 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)) \
)
/* 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


Loading…
Cancel
Save