From ca88cdc6f1450788a70f26b0c5c6f56df0ae36f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Thu, 1 Jun 2017 07:28:18 +0200
Subject: [PATCH] fixup! fixup! cpu/kw41z: Add support for NXP Kinetis KW41Z
 SoC

---
 cpu/kw41z/Makefile.include           | 14 ++++++++------
 cpu/kw41z/ldscripts/mkw41z512vht4.ld |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 120000 cpu/kw41z/ldscripts/mkw41z512vht4.ld

diff --git a/cpu/kw41z/Makefile.include b/cpu/kw41z/Makefile.include
index f5dd10f9178d3..320fc3502ed8b 100644
--- a/cpu/kw41z/Makefile.include
+++ b/cpu/kw41z/Makefile.include
@@ -1,6 +1,14 @@
 # define the CPU architecture for the kw41z
 export CPU_ARCH = cortex-m0plus
 
+# map CPU models to generic Kinetis linkerscript
+LD_MKW41Z512VHT4 = kinetis_f512l32u96.ld
+LD_MKW31Z512VHT4 = kinetis_f512l32u96.ld
+LD_MKW21Z512VHT4 = kinetis_f512l32u96.ld
+LD_MKW41Z256VHT4 = kinetis_f256l16u48.ld
+LD_MKW31Z256VHT4 = kinetis_f256l16u48.ld
+LD_MKW21Z256VHT4 = kinetis_f256l16u48.ld
+
 # tell the build system that the CPU depends on the Kinetis common files
 export USEMODULE += kinetis_common
 
@@ -9,12 +17,6 @@ export KINETIS_COMMON = $(RIOTCPU)/kinetis_common/
 # CPU depends on the kinetis module, so include it
 include $(KINETIS_COMMON)Makefile.include
 
-#export the CPU model
-MODEL = $(shell echo $(CPU_MODEL)|tr 'a-z' 'A-Z')
-export CFLAGS += -DCPU_MODEL_$(MODEL)
-ARCH = $(shell echo $(CPU_ARCH) | tr 'a-z-' 'A-Z_')
-export CFLAGS += -DCPU_ARCH_$(ARCH)
-
 # this CPU implementation is using Kinetis common startup
 export COMMON_STARTUP = $(KINETIS_COMMON)
 
diff --git a/cpu/kw41z/ldscripts/mkw41z512vht4.ld b/cpu/kw41z/ldscripts/mkw41z512vht4.ld
deleted file mode 120000
index 58d51eea4edcb..0000000000000
--- a/cpu/kw41z/ldscripts/mkw41z512vht4.ld
+++ /dev/null
@@ -1 +0,0 @@
-../../kinetis_common/ldscripts/kinetis_f512l32u96.ld
\ No newline at end of file