Browse Source

Add BOOTLOADER_SIZE and remove BOOT_SIZE

- define BOOTLOADER_SIZE in config.h instead of Makefile
tags/v1.9
tmk 11 years ago
parent
commit
51050875b7

+ 9
- 7
common/bootloader.c View File

@@ -12,16 +12,18 @@


/* Boot Section Size in *BYTEs*
* Teensy halfKay 512
* Teensy++ halfKay 1024
* Atmel DFU loader 4096
* LUFA bootloader 4096
* Teensy halfKay 512
* Teensy++ halfKay 1024
* Atmel DFU loader 4096
* LUFA bootloader 4096
* USBaspLoader 2048
*/
#ifndef BOOT_SIZE
#define BOOT_SIZE 512
#ifndef BOOTLOADER_SIZE
#warn To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
#endif

#define FLASH_SIZE (FLASHEND + 1L)
#define BOOTLOADER_START (FLASH_SIZE - BOOT_SIZE)
#define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE)


/*

+ 0
- 7
keyboard/gh60/Makefile.lufa View File

@@ -107,13 +107,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support


# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=4096


# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)

+ 10
- 2
keyboard/gh60/config.h View File

@@ -25,12 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001
#define MANUFACTURER geekhack
#define PRODUCT GH60


/* message strings */
#define DESCRIPTION t.m.k. keyboard firmware for GH60


/* Boot Section Size in *BYTEs*
* Teensy halfKay 512
* Teensy++ halfKay 1024
* Atmel DFU loader 4096
* LUFA bootloader 4096
* USBaspLoader 2048
*/
#define BOOTLOADER_SIZE 4096


/* matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14

+ 0
- 9
keyboard/hhkb/Makefile.iwrap View File

@@ -49,15 +49,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
#NKRO_ENABLE = yes # USB Nkey Rollover


# Boot Section Size in *BYTEs*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOT_SIZE=2048



#---------------- Programming Options --------------------------
AVRDUDE = avrdude

+ 0
- 8
keyboard/hhkb/Makefile.lufa View File

@@ -107,14 +107,6 @@ CONSOLE_ENABLE = yes # Console for debug
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support


# Boot Section Size in *BYTEs*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOT_SIZE=1024


# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)

+ 9
- 1
keyboard/hhkb/config.h View File

@@ -27,9 +27,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0103
#define MANUFACTURER t.m.k.
#define PRODUCT HHKB mod
#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 */

+ 10
- 0
keyboard/hhkb/config_iwrap.h View File

@@ -27,6 +27,16 @@ 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

Loading…
Cancel
Save