X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon.mk;h=e165a78b9b8152b72405c924c1d3ecbf86ba5b52;hb=40e24e7ee9e8f871358a54953f9515c444ebf5b8;hp=04ba0d60e3bb4986d55ab11a8a94c4f054cf1c60;hpb=0c40b669f01a3bc63545d271b1fb05cf820f02e5;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 04ba0d60..e165a78b 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -70,11 +70,19 @@ endif
 
 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
-OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+VERSION := $(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+OPT_DEFS += -DVERSION=$(VERSION)
 
 
 # Search Path