diff options
| author | tmk <nobody@nowhere> | 2013-09-11 14:01:47 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-09-11 14:01:47 +0900 |
| commit | 259c4a040af658552d7a003655572c33d8fcef83 (patch) | |
| tree | 63ae148e3e6c0be4cd0ef35bf9db0162abae3af4 | |
| parent | 8bc96ac57174692b7604ddc65e22dea6ddb1824b (diff) | |
| download | firmware-259c4a040af658552d7a003655572c33d8fcef83.tar.gz firmware-259c4a040af658552d7a003655572c33d8fcef83.tar.bz2 firmware-259c4a040af658552d7a003655572c33d8fcef83.zip | |
Add build option KEYMAP_SECTION for keymap editor
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | keyboard/hhkb/Makefile | 17 | ||||
| -rw-r--r-- | ldscript_keymap_avr5.x (renamed from keyboard/hhkb/ld_keymap_avr5.x) | 0 |
3 files changed, 11 insertions, 10 deletions
@@ -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 342219372..34bafc24f 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 index c09693e51..c09693e51 100644 --- a/keyboard/hhkb/ld_keymap_avr5.x +++ b/ldscript_keymap_avr5.x |