Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add BOOTLOADER_SIZE and remove BOOT_SIZE

Browse source 
- define BOOTLOADER_SIZE in config.h instead of Makefile
This commit is contained in:
tmk 2013-03-10 15:36:07 +09:00
parent f55c677ba4
commit 51050875b7
7 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/bootloader.c
View file

@ -12,16 +12,18 @@
/* Boot Section Size in *BYTEs* /* Boot Section Size in *BYTEs*
* Teensy halfKay 512 * Teensy halfKay 512
* Teensy++ halfKay 1024 * Teensy++ halfKay 1024
* Atmel DFU loader 4096 * Atmel DFU loader 4096
* LUFA bootloader 4096 * LUFA bootloader 4096
* USBaspLoader 2048
*/ */
#ifndef BOOT_SIZE #ifndef BOOTLOADER_SIZE
#define BOOT_SIZE 512 #warn To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
#endif #endif
#define FLASH_SIZE (FLASHEND + 1L) #define FLASH_SIZE (FLASHEND + 1L)
#define BOOTLOADER_START (FLASH_SIZE - BOOT_SIZE) #define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE)
/* /*

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 #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 # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TOP_DIR)

12
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 DEVICE_VER 0x0001
#define MANUFACTURER geekhack #define MANUFACTURER geekhack
#define PRODUCT GH60 #define PRODUCT GH60
/* message strings */ /* message strings */
#define DESCRIPTION t.m.k. keyboard firmware for GH60 #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 */ /* matrix size */
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5
#define MATRIX_COLS 14 #define MATRIX_COLS 14

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 #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 -------------------------- #---------------- Programming Options --------------------------
AVRDUDE = avrdude AVRDUDE = avrdude

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 #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 # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TOP_DIR)

12
keyboard/hhkb/config.h
View file

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

10
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 #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