From 5203ad26438f470c7861428c065f8e72f55a6f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Sat, 25 Mar 2017 18:24:22 +0100
Subject: [PATCH] k60: Use kinetis_common ldscript, rectify CPU_MODEL to full
part number
---
boards/mulle/Makefile.include | 2 +-
cpu/k60/include/cpu_conf.h | 2 +-
cpu/k60/ldscripts/K60DN256VLL10.ld | 12 ------------
cpu/k60/ldscripts/K60DN512VLL10.ld | 12 ------------
cpu/k60/ldscripts/mk60dn256vll10.ld | 1 +
cpu/k60/ldscripts/mk60dn512vll10.ld | 1 +
6 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 cpu/k60/ldscripts/K60DN256VLL10.ld
delete mode 100644 cpu/k60/ldscripts/K60DN512VLL10.ld
create mode 120000 cpu/k60/ldscripts/mk60dn256vll10.ld
create mode 120000 cpu/k60/ldscripts/mk60dn512vll10.ld
diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include
index bd2c87111d..8c8511c091 100644
--- a/boards/mulle/Makefile.include
+++ b/boards/mulle/Makefile.include
@@ -17,7 +17,7 @@ endif
# The linker script needs to know the flash and RAM sizes of the device.
ifeq ($(CPU_MODEL),)
- CPU_MODEL = K60DN512VLL10
+ CPU_MODEL = mk60dn512vll10
endif
export CPU_MODEL
diff --git a/cpu/k60/include/cpu_conf.h b/cpu/k60/include/cpu_conf.h
index 42d1583639..76664982cc 100644
--- a/cpu/k60/include/cpu_conf.h
+++ b/cpu/k60/include/cpu_conf.h
@@ -30,7 +30,7 @@ extern "C"
#include <stdint.h>
-#if defined(CPU_MODEL_K60DN512VLL10) || defined(CPU_MODEL_K60DN256VLL10)
+#if defined(CPU_MODEL_MK60DN512VLL10) || defined(CPU_MODEL_MK60DN256VLL10)
#include "vendor/MK60D10.h"
/** The expected CPUID value, can be used to implement a check that we are
diff --git a/cpu/k60/ldscripts/K60DN256VLL10.ld b/cpu/k60/ldscripts/K60DN256VLL10.ld
deleted file mode 100644
index 0112ddc388..0000000000
--- a/cpu/k60/ldscripts/K60DN256VLL10.ld
+++ /dev/null
@@ -1,12 +0,0 @@
-OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
-MEMORY
-{
- vectors (rx) : ORIGIN = 0x00000000, LENGTH = 0x400
- flashsec (rx) : ORIGIN = 0x00000400, LENGTH = 0x10
- rom (rx) : ORIGIN = 0x00000410, LENGTH = 256K - 0x410
- ram (rwx) : ORIGIN = 0x20000000 - 32K, LENGTH = 64K
-}
-
-INCLUDE kinetis.ld
diff --git a/cpu/k60/ldscripts/K60DN512VLL10.ld b/cpu/k60/ldscripts/K60DN512VLL10.ld
deleted file mode 100644
index 84b7808a0d..0000000000
--- a/cpu/k60/ldscripts/K60DN512VLL10.ld
+++ /dev/null
@@ -1,12 +0,0 @@
-OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
-MEMORY
-{
- vectors (rx) : ORIGIN = 0x00000000, LENGTH = 0x400
- flashsec (rx) : ORIGIN = 0x00000400, LENGTH = 0x10
- rom (rx) : ORIGIN = 0x00000410, LENGTH = 512K - 0x410
- ram (rwx) : ORIGIN = 0x20000000 - 64K, LENGTH = 128K
-}
-
-INCLUDE kinetis.ld
diff --git a/cpu/k60/ldscripts/mk60dn256vll10.ld b/cpu/k60/ldscripts/mk60dn256vll10.ld
new file mode 120000
index 0000000000..50d00315ee
--- /dev/null
+++ b/cpu/k60/ldscripts/mk60dn256vll10.ld
@@ -0,0 +1 @@
+../../kinetis_common/ldscripts/kinetis_f256l32u32.ld
\ No newline at end of file
diff --git a/cpu/k60/ldscripts/mk60dn512vll10.ld b/cpu/k60/ldscripts/mk60dn512vll10.ld
new file mode 120000
index 0000000000..1bdedcfa90
--- /dev/null
+++ b/cpu/k60/ldscripts/mk60dn512vll10.ld
@@ -0,0 +1 @@
+../../kinetis_common/ldscripts/kinetis_f512l64u64.ld
\ No newline at end of file
--
GitLab