summary refs log tree commit diff
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-11 15:28:14 +0900
committertmk <nobody@nowhere>2013-03-11 15:28:46 +0900
commitef8439bddb2d7fe5fd95faf2b6bebd8235acf160 (patch)
tree4af03a20658cb7e6cd43f9c65dfa002f1b544332 /keyboard
parentd055e0633e36e97802d60554f6002e47021ba5fd (diff)
Add build option BOOTMAGIC_ENABLE
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/gh60/Makefile.lufa4
-rw-r--r--keyboard/gh60/Makefile.pjrc9
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index b885b7dfa1..a5ff609a77 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -47,8 +47,7 @@ TOP_DIR = ../..
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
-
-# List C source files here. (C dependencies are automatically generated.)
+# project specific files
 SRC +=	keymap.c \
 	matrix.c \
 	led.c
@@ -100,6 +99,7 @@ F_USB = $(F_CPU)
 # Build Options
 #   comment out to disable the options.
 #
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index 2538c0c6bb..f03ca9416d 100644
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -47,7 +47,7 @@ TOP_DIR = ../..
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
-# keyboard dependent files
+# project specific files
 SRC =	keymap.c \
 	matrix.c \
 	led.c
@@ -57,10 +57,8 @@ CONFIG_H = config.h
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
-#MCU = at90usb162       # Teensy 1.0
-MCU = atmega32u4       # Teensy 2.0
-#MCU = at90usb646       # Teensy++ 1.0
-#MCU = at90usb1286      # Teensy++ 2.0
+MCU = atmega32u4
+#MCU = at90usb1286
 
 
 # Processor frequency.
@@ -79,6 +77,7 @@ OPT_DEFS += -DBOOT_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes	# Mouse keys(+5000)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+600)
 NKRO_ENABLE = yes	# USB Nkey Rollover(+500)