Merge pull request #230 from jerryen/master

Add KEYBOARD_LOCK_ENABLE to makefile

diff --combined tmk_core/common.mk
index cb030b331333cd45cc965a4433819174faa92c01,04ba0d60e3bb4986d55ab11a8a94c4f054cf1c60..3b53c0a046764e6b50c120c03c03c2451a3ab417
--- 1/tmk_core/common.mk
--- 2/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