Merge pull request #6791 from gebart/pr/kinetis-ldscript-unification

kinetis: move ldscripts to kinetis_common for easier reuse

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

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

cpu/k60/ldscripts/mk60dn256vll10.ld

+../../kinetis_common/ldscripts/kinetis_f256l32u32.ld
\ No newline at end of file

cpu/k60/ldscripts/mk60dn512vll10.ld

+../../kinetis_common/ldscripts/kinetis_f512l64u64.ld
\ No newline at end of file

cpu/k64f/ldscripts/mk64fn1m0vll12.ld

-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
-MEMORY
-{
-    vectors (rx) : ORIGIN = 0x00000000, LENGTH = 0x400
-    flashsec (rx): ORIGIN = 0x00000400, LENGTH = 0x10
-    rom (rx)     : ORIGIN = 0x00000410, LENGTH = 1024K - 0x410
-    ram (rwx)    : ORIGIN = 0x1fff0198, LENGTH = 256K-0x198
-}
-
-INCLUDE kinetis.ld

cpu/k64f/ldscripts/mk64fn1m0vll12.ld

+../../kinetis_common/ldscripts/kinetis_f1024l64u192.ld
\ No newline at end of file

cpu/kinetis_common/ldscripts/kinetis_f1024l64u192.ld

+/*
+ * NXP Kinetis CPU with the following memory layout:
+ * 1024 kB flash @ 0x00000000
+ * 256 kB RAM, split into two banks: 64 kB SRAM_L, 192 kB SRAM_U.
+ * SRAM_L ends at 0x1fffffff, SRAM_U begins at 0x20000000
+ */
+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 = 1024K - 0x410
+    ram (rwx)      : ORIGIN = 0x20000000 - 64K, LENGTH = 256K
+}
+
+INCLUDE kinetis.ld

cpu/kinetis_common/ldscripts/kinetis_f256l16u16.ld

+/*
+ * NXP Kinetis CPU with the following memory layout:
+ * 256 kB flash @ 0x00000000
+ * 32 kB RAM, split into two banks: 16 kB SRAM_L, 16 kB SRAM_U.
+ * SRAM_L ends at 0x1fffffff, SRAM_U begins at 0x20000000
+ */
+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 - 16K, LENGTH = 32K
+}
+
+INCLUDE kinetis.ld

cpu/k60/ldscripts/K60DN256VLL10.ld → cpu/kinetis_common/ldscripts/kinetis_f256l32u32.ld

+/*
+ * NXP Kinetis CPU with the following memory layout:
+ * 256 kB flash @ 0x00000000
+ * 64 kB RAM, split into two banks: 32 kB SRAM_L, 32 kB SRAM_U.
+ * SRAM_L ends at 0x1fffffff, SRAM_U begins at 0x20000000
+ */
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 

cpu/kinetis_common/ldscripts/kinetis_f512l32u32.ld

+/*
+ * NXP Kinetis CPU with the following memory layout:
+ * 512 kB flash @ 0x00000000
+ * 64 kB RAM, split into two banks: 32 kB SRAM_L, 32 kB SRAM_U.
+ * SRAM_L ends at 0x1fffffff, SRAM_U begins at 0x20000000
+ */
+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 - 32K, LENGTH = 64K
+}
+
+INCLUDE kinetis.ld

cpu/k60/ldscripts/K60DN512VLL10.ld → cpu/kinetis_common/ldscripts/kinetis_f512l64u64.ld

+/*
+ * NXP Kinetis CPU with the following memory layout:
+ * 512 kB flash @ 0x00000000
+ * 128 kB RAM, split into two banks: 64 kB SRAM_L, 64 kB SRAM_U.
+ * SRAM_L ends at 0x1fffffff, SRAM_U begins at 0x20000000
+ */
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 

cpu/kw2xd/ldscripts/kw21d256.ld

-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "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 = 0x1fffc000, LENGTH = 32K
-}
-
-INCLUDE kinetis.ld

cpu/kw2xd/ldscripts/kw21d256.ld

+../../kinetis_common/ldscripts/kinetis_f256l16u16.ld
\ No newline at end of file

cpu/kw2xd/ldscripts/kw21d512.ld

-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "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 = 0x1fff8000, LENGTH = 64K
-}
-
-INCLUDE kinetis.ld

cpu/kw2xd/ldscripts/kw21d512.ld

+../../kinetis_common/ldscripts/kinetis_f512l32u32.ld
\ No newline at end of file

cpu/kw2xd/ldscripts/kw22d512.ld

-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "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 = 0x1fff8000, LENGTH = 64K
-}
-
-INCLUDE kinetis.ld

cpu/kw2xd/ldscripts/kw22d512.ld

+../../kinetis_common/ldscripts/kinetis_f512l32u32.ld
\ No newline at end of file