Add BOOTLOADER_SIZE and remove BOOT_SIZE
- define BOOTLOADER_SIZE in config.h instead of Makefile
This commit is contained in:
		
							parent
							
								
									f55c677ba4
								
							
						
					
					
						commit
						51050875b7
					
				
					 7 changed files with 39 additions and 35 deletions
				
			
		| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,11 +27,19 @@ 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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* 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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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…
	
	Add table
		Add a link
		
	
		Reference in a new issue