aboutsummaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-29 11:31:21 +0900
committertmk <nobody@nowhere>2013-03-29 11:31:21 +0900
commit353a9b56e6caee853d3f808d2bfedf07056b4518 (patch)
tree462718683391051273e9e9b0a0b5fa2c4763215f /keyboard
parent41bf9204127842e852ce4fa0ad35998a3b3d79c5 (diff)
downloadqmk_firmware-353a9b56e6caee853d3f808d2bfedf07056b4518.tar.gz
qmk_firmware-353a9b56e6caee853d3f808d2bfedf07056b4518.zip
Fix BOOTLOADER_SIZE setting
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/gh60/Makefile.lufa7
-rw-r--r--keyboard/gh60/Makefile.pjrc4
-rw-r--r--keyboard/gh60/config.h9
-rw-r--r--keyboard/hbkb/Makefile.lufa2
-rw-r--r--keyboard/hbkb/config.h9
-rw-r--r--keyboard/hhkb/config.h10
-rw-r--r--keyboard/hhkb/config_iwrap.h10
-rw-r--r--keyboard/hid_liber/Makefile.lufa2
-rw-r--r--keyboard/hid_liber/Makefile.pjrc2
-rw-r--r--keyboard/hid_liber/config.h9
-rw-r--r--keyboard/macway/Makefile.lufa2
-rw-r--r--keyboard/macway/config.h9
-rw-r--r--keyboard/phantom/Makefile.lufa2
-rw-r--r--keyboard/phantom/config.h9
14 files changed, 11 insertions, 75 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index 278f966de..ad7d219e3 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -96,11 +96,13 @@ F_USB = $(F_CPU)
96#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT 96#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
97 97
98 98
99# Boot Section Size in bytes 99# Boot Section Size in *bytes*
100# Teensy halfKay 512 100# Teensy halfKay 512
101# Teensy++ halfKay 1024
101# Atmel DFU loader 4096 102# Atmel DFU loader 4096
102# LUFA bootloader 4096 103# LUFA bootloader 4096
103OPT_DEFS += -DBOOT_SIZE=4096 104# USBaspLoader 2048
105OPT_DEFS += -DBOOTLOADER_SIZE=4096
104 106
105 107
106# Build Options 108# Build Options
@@ -113,7 +115,6 @@ CONSOLE_ENABLE = yes # Console for debug(+400)
113COMMAND_ENABLE = yes # Commands for debug and configuration 115COMMAND_ENABLE = yes # Commands for debug and configuration
114SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 116SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
115#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA 117#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
116#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
117 118
118 119
119# Optimize size but this may cause error "relocation truncated to fit" 120# Optimize size but this may cause error "relocation truncated to fit"
diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index c12334fca..0ea33ea30 100644
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -69,11 +69,11 @@ MCU = atmega32u4
69F_CPU = 16000000 69F_CPU = 16000000
70 70
71 71
72# Boot Section Size in bytes 72# Boot Section Size in *bytes*
73# Teensy halfKay 512 73# Teensy halfKay 512
74# Atmel DFU loader 4096 74# Atmel DFU loader 4096
75# LUFA bootloader 4096 75# LUFA bootloader 4096
76OPT_DEFS += -DBOOT_SIZE=4096 76OPT_DEFS += -DBOOTLOADER_SIZE=4096
77 77
78 78
79# Build Options 79# Build Options
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h
index 7fe28470d..fbe587081 100644
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -47,15 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 47 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
48) 48)
49 49
50/* Boot Section Size in *BYTEs*
51 * Teensy halfKay 512
52 * Teensy++ halfKay 1024
53 * Atmel DFU loader 4096
54 * LUFA bootloader 4096
55 * USBaspLoader 2048
56 */
57#define BOOTLOADER_SIZE 4096
58
59 50
60 51
61/* 52/*
diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa
index a626d476c..0d103c876 100644
--- a/keyboard/hbkb/Makefile.lufa
+++ b/keyboard/hbkb/Makefile.lufa
@@ -108,7 +108,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
108# Teensy halfKay 512 108# Teensy halfKay 512
109# Atmel DFU loader 4096 109# Atmel DFU loader 4096
110# LUFA bootloader 4096 110# LUFA bootloader 4096
111OPT_DEFS += -DBOOT_SIZE=4096 111OPT_DEFS += -DBOOTLOADER_SIZE=4096
112 112
113 113
114# Search Path 114# Search Path
diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h
index b31a86538..9db8c2c4d 100644
--- a/keyboard/hbkb/config.h
+++ b/keyboard/hbkb/config.h
@@ -48,13 +48,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48 keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ 48 keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \
49) 49)
50 50
51/* Boot Section Size in *BYTEs*
52 * Teensy halfKay 512
53 * Teensy++ halfKay 1024
54 * Atmel DFU loader 4096
55 * LUFA bootloader 4096
56 * USBaspLoader 2048
57 */
58#define BOOTLOADER_SIZE 4096
59
60#endif 51#endif
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index e34d9a6ba..6e26edbef 100644
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -30,16 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod 30#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
31 31
32 32
33/* Boot Section Size in *BYTEs*
34 * Teensy halfKay 512
35 * Teensy++ halfKay 1024
36 * Atmel DFU loader 4096
37 * LUFA bootloader 4096
38 * USBaspLoader 2048
39 */
40#define BOOTLOADER_SIZE 1024
41
42
43/* matrix size */ 33/* matrix size */
44#define MATRIX_ROWS 8 34#define MATRIX_ROWS 8
45#define MATRIX_COLS 8 35#define MATRIX_COLS 8
diff --git a/keyboard/hhkb/config_iwrap.h b/keyboard/hhkb/config_iwrap.h
index 7a4ec3711..d459a5efb 100644
--- a/keyboard/hhkb/config_iwrap.h
+++ b/keyboard/hhkb/config_iwrap.h
@@ -27,16 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod 27#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
28 28
29 29
30/* Boot Section Size in *BYTEs*
31 * Teensy halfKay 512
32 * Teensy++ halfKay 1024
33 * Atmel DFU loader 4096
34 * LUFA bootloader 4096
35 * USBaspLoader 2048
36 */
37#define BOOTLOADER_SIZE 2048
38
39
40/* matrix size */ 30/* matrix size */
41#define MATRIX_ROWS 8 31#define MATRIX_ROWS 8
42#define MATRIX_COLS 8 32#define MATRIX_COLS 8
diff --git a/keyboard/hid_liber/Makefile.lufa b/keyboard/hid_liber/Makefile.lufa
index 498f17ed7..39a4d1e0f 100644
--- a/keyboard/hid_liber/Makefile.lufa
+++ b/keyboard/hid_liber/Makefile.lufa
@@ -101,7 +101,7 @@ F_USB = $(F_CPU)
101# Teensy halfKay 512 101# Teensy halfKay 512
102# Atmel DFU loader 4096 102# Atmel DFU loader 4096
103# LUFA bootloader 4096 103# LUFA bootloader 4096
104OPT_DEFS += -DBOOT_SIZE=4096 104OPT_DEFS += -DBOOTLOADER_SIZE=4096
105 105
106 106
107# Build Options 107# Build Options
diff --git a/keyboard/hid_liber/Makefile.pjrc b/keyboard/hid_liber/Makefile.pjrc
index 70ad47f29..1ef8741bf 100644
--- a/keyboard/hid_liber/Makefile.pjrc
+++ b/keyboard/hid_liber/Makefile.pjrc
@@ -75,7 +75,7 @@ F_CPU = 16000000
75# Teensy halfKay 512 75# Teensy halfKay 512
76# Atmel DFU loader 4096 76# Atmel DFU loader 4096
77# LUFA bootloader 4096 77# LUFA bootloader 4096
78OPT_DEFS += -DBOOT_SIZE=4096 78OPT_DEFS += -DBOOTLOADER_SIZE=4096
79 79
80 80
81# Build Options 81# Build Options
diff --git a/keyboard/hid_liber/config.h b/keyboard/hid_liber/config.h
index 17fc2ed89..9ee380468 100644
--- a/keyboard/hid_liber/config.h
+++ b/keyboard/hid_liber/config.h
@@ -46,15 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 46 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
47) 47)
48 48
49/* Boot Section Size in *BYTEs*
50 * Teensy halfKay 512
51 * Teensy++ halfKay 1024
52 * Atmel DFU loader 4096
53 * LUFA bootloader 4096
54 * USBaspLoader 2048
55 */
56#define BOOTLOADER_SIZE 4096
57
58// TODO: configurable 49// TODO: configurable
59#define DEBUG_LED 0 50#define DEBUG_LED 0
60#define DEBUG_LED_CONFIG 51#define DEBUG_LED_CONFIG
diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa
index f0acf7671..359a8c246 100644
--- a/keyboard/macway/Makefile.lufa
+++ b/keyboard/macway/Makefile.lufa
@@ -109,7 +109,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
109# Teensy halfKay 512 109# Teensy halfKay 512
110# Atmel DFU loader 4096 110# Atmel DFU loader 4096
111# LUFA bootloader 4096 111# LUFA bootloader 4096
112#OPT_DEFS += -DBOOT_SIZE=4096 112#OPT_DEFS += -DBOOTLOADER_SIZE=4096
113 113
114 114
115# Search Path 115# Search Path
diff --git a/keyboard/macway/config.h b/keyboard/macway/config.h
index b88f898e2..74093405a 100644
--- a/keyboard/macway/config.h
+++ b/keyboard/macway/config.h
@@ -51,15 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
51 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 51 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
52) 52)
53 53
54/* Boot Section Size in *BYTEs*
55 * Teensy halfKay 512
56 * Teensy++ halfKay 1024
57 * Atmel DFU loader 4096
58 * LUFA bootloader 4096
59 * USBaspLoader 2048
60 */
61#define BOOTLOADER_SIZE 4096
62
63/* PS/2 mouse */ 54/* PS/2 mouse */
64#ifdef PS2_MOUSE_ENABLE 55#ifdef PS2_MOUSE_ENABLE
65# define PS2_CLOCK_PORT PORTF 56# define PS2_CLOCK_PORT PORTF
diff --git a/keyboard/phantom/Makefile.lufa b/keyboard/phantom/Makefile.lufa
index 641d8c52a..c8c13da09 100644
--- a/keyboard/phantom/Makefile.lufa
+++ b/keyboard/phantom/Makefile.lufa
@@ -108,7 +108,7 @@ CONSOLE_ENABLE = yes # Console for debug
108# Teensy halfKay 512 108# Teensy halfKay 512
109# Atmel DFU loader 4096 109# Atmel DFU loader 4096
110# LUFA bootloader 4096 110# LUFA bootloader 4096
111OPT_DEFS += -DBOOT_SIZE=512 111OPT_DEFS += -DBOOTLOADER_SIZE=512
112 112
113 113
114# Search Path 114# Search Path
diff --git a/keyboard/phantom/config.h b/keyboard/phantom/config.h
index a5d472979..18bd13041 100644
--- a/keyboard/phantom/config.h
+++ b/keyboard/phantom/config.h
@@ -47,15 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 47 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
48) 48)
49 49
50/* Boot Section Size in *BYTEs*
51 * Teensy halfKay 512
52 * Teensy++ halfKay 1024
53 * Atmel DFU loader 4096
54 * LUFA bootloader 4096
55 * USBaspLoader 2048
56 */
57#define BOOTLOADER_SIZE 4096
58
59// TODO: configurable 50// TODO: configurable
60#define DEBUG_LED 0 51#define DEBUG_LED 0
61#define DEBUG_LED_CONFIG 52#define DEBUG_LED_CONFIG
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 03:25:48 +0000