From 259c4a040af658552d7a003655572c33d8fcef83 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 11 Sep 2013 14:01:47 +0900 Subject: [PATCH] Add build option KEYMAP_SECTION for keymap editor --- common.mk | 4 ++++ keyboard/hhkb/Makefile | 17 +++++++---------- .../ld_keymap_avr5.x => ldscript_keymap_avr5.x | 0 3 files changed, 11 insertions(+), 10 deletions(-) rename keyboard/hhkb/ld_keymap_avr5.x => ldscript_keymap_avr5.x (100%) diff --git a/common.mk b/common.mk index 64ef86c4..9523ae87 100644 --- a/common.mk +++ b/common.mk @@ -68,6 +68,10 @@ ifdef BACKLIGHT_ENABLE OPT_DEFS += -DBACKLIGHT_ENABLE endif +ifdef KEYMAP_SECTION_ENABLE + OPT_DEFS += -DKEYMAP_SECTION + EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x +endif # Version string OPT_DEFS += -DVERSION=$(shell (git describe --dirty || echo 'unknown') 2> /dev/null) diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile index 34221937..34bafc24 100644 --- a/keyboard/hhkb/Makefile +++ b/keyboard/hhkb/Makefile @@ -111,18 +111,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options # comment out to disable the options. # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor -# keymap section -EXTRALDFLAGS = -Wl,-Tld_keymap_avr5.x -OPT_DEFS += -DKEYMAP_SECTION - # Search Path VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) diff --git a/keyboard/hhkb/ld_keymap_avr5.x b/ldscript_keymap_avr5.x similarity index 100% rename from keyboard/hhkb/ld_keymap_avr5.x rename to ldscript_keymap_avr5.x