diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index bd2c87111d25cb828c97980577f4f867f23ec8ae..8c8511c091d3453979ff0c6c8cac4c428fb64d39 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 42d158363952b91ce5bcbcb61daaff3cff95afb7..76664982cc38d5977d5e2016a92769d5cdfa8f9d 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 0112ddc388b97fffed06193e655e2ace0d3e0e96..0000000000000000000000000000000000000000 --- 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 84b7808a0d86156b259eb3b44a3d02a827506ab2..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..50d00315ee37f5c456b92f169f03086c11161c9a --- /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 0000000000000000000000000000000000000000..1bdedcfa902b7d166705d1f0401f0b707c120dbf --- /dev/null +++ b/cpu/k60/ldscripts/mk60dn512vll10.ld @@ -0,0 +1 @@ +../../kinetis_common/ldscripts/kinetis_f512l64u64.ld \ No newline at end of file