From 9a3edb897ab8549bae089645c0d7f27df8fa15b7 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 21 Mar 2013 01:36:59 +0900
Subject: [PATCH] Fix Makefile and config.h of gh60 for new options
---
README.md | 1 +
keyboard/gh60/Makefile.lufa | 4 ++--
keyboard/gh60/Makefile.pjrc | 3 ++-
keyboard/gh60/config.h | 19 ++++++++++++++-----
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index e0b837df4b..3b700970f0 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ Note that ***comment out*** to disable them.
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
+ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index f740dea848..f153bc311d 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -103,14 +103,14 @@ 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)
-COMMAND_ENABLE = yes # Magic command
+COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
# Optimize size but this may cause error "relocation truncated to fit"
-EXTRALDFLAGS = -Wl,--relax
+#EXTRALDFLAGS = -Wl,--relax
# Search Path
VPATH += $(TARGET_DIR)
diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index f03ca9416d..290f7cb877 100644
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -80,8 +80,9 @@ OPT_DEFS += -DBOOT_SIZE=4096
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)
CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+NKRO_ENABLE = yes # USB Nkey Rollover(+500)
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h
index 7da5c6bbff..679ff36626 100644
--- a/keyboard/gh60/config.h
+++ b/keyboard/gh60/config.h
@@ -56,15 +56,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define BOOTLOADER_SIZE 4096
+
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
/* disable debug print */
//#define NO_DEBUG
+
/* disable print */
//#define NO_PRINT
-#define NO_ACTION_KEYMAP
-#define NO_ACTION_OVERLAY
-#define NO_ACTION_TAPPING
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+/* disable action features */
+//#define NO_ACTION_KEYMAP
+//#define NO_ACTION_OVERLAY
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
#endif