-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
+#HHKB_JP ?= yes # HHKB JP support
+#UNIMAP_ENABLE ?= yes # Universal keymap
+#ACTIONMAP_ENABLE ?= yes # Use 16bit actionmap instead of 8bit keymap
+#KEYMAP_SECTION_ENABLE ?= yes # fixed address keymap for keymap editor
+
+#OPT_DEFS += -DNO_ACTION_TAPPING
+#OPT_DEFS += -DNO_ACTION_LAYER
+#OPT_DEFS += -DNO_ACTION_MACRO
+
+
+#
+# Keymap file
+#
+ifeq (yes,$(strip $(UNIMAP_ENABLE)))
+ KEYMAP_FILE = unimap
+else
+ ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
+ KEYMAP_FILE = actionmap
+ else
+ KEYMAP_FILE = keymap
+ endif
+endif
+ifdef KEYMAP
+ SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
+else
+ ifeq (yes,$(strip $(HHKB_JP)))
+ SRC := $(KEYMAP_FILE)_jp.c $(SRC)
+ else
+ SRC := $(KEYMAP_FILE)_hhkb.c $(SRC)
+ endif
+endif
+
+
+ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+ OPT_DEFS += -DHHKB_JP
+endif