From: tmk <tmk@users.noreply.github.com>
Date: Sat, 16 Jan 2016 02:17:13 +0000 (+0900)
Subject: Merge pull request #230 from jerryen/master
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=inline;h=fb1fb122a5971723f374cd737b7cc0aefd470af3;hp=-c;p=max%2Ftmk_keyboard.git

Merge pull request #230 from jerryen/master

Add KEYBOARD_LOCK_ENABLE to makefile
---

fb1fb122a5971723f374cd737b7cc0aefd470af3
diff --combined tmk_core/common.mk
index cb030b33,04ba0d60..3b53c0a0
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@@ -53,6 -53,10 +53,10 @@@ ifdef USB_6KRO_ENABL
      OPT_DEFS += -DUSB_6KRO_ENABLE
  endif
  
+ ifdef KEYBOARD_LOCK_ENABLE
+     OPT_DEFS += -DKEYBOARD_LOCK_ENABLE
+ endif
+ 
  ifdef SLEEP_LED_ENABLE
      SRC += $(COMMON_DIR)/sleep_led.c
      OPT_DEFS += -DSLEEP_LED_ENABLE
@@@ -66,14 -70,7 +70,14 @@@ endi
  
  ifdef KEYMAP_SECTION_ENABLE
      OPT_DEFS += -DKEYMAP_SECTION_ENABLE
 -    EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x
 +
 +    ifeq ($(strip $(MCU)),atmega32u2)
 +	EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x
 +    else ifeq ($(strip $(MCU)),atmega32u4)
 +	EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x
 +    else
 +	EXTRALDFLAGS = $(error no ldscript for keymap section)
 +    endif
  endif
  
  # Version string