From c2e39c107bd1fdd24cb04e2a91383d6181f51833 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 11 Jun 2015 08:38:56 -0600
Subject: [PATCH] Kinetis:  Add logic to set CFM protect area to all 0xff in
 all configurations

---
 configs/kwikstik-k40/scripts/ld.script | 7 ++++---
 configs/teensy-3.x/scripts/flash.ld    | 7 ++++---
 configs/twr-k60n512/scripts/ld.script  | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/configs/kwikstik-k40/scripts/ld.script b/configs/kwikstik-k40/scripts/ld.script
index 97ac473caa..bcd3282999 100755
--- a/configs/kwikstik-k40/scripts/ld.script
+++ b/configs/kwikstik-k40/scripts/ld.script
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/kwikstik-k40/scripts/ld.script
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 MEMORY
 {
-	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K - 16
+	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K
 	cfmprotect (rx) : ORIGIN = 0x00000400, LENGTH = 16
 	progflash (rx)  : ORIGIN = 0x00000800, LENGTH = 256K - 2K
 	datasram (rwx)  : ORIGIN = 0x1fff8000, LENGTH = 64K
@@ -56,6 +56,7 @@ MEMORY
 
 OUTPUT_ARCH(arm)
 ENTRY(_stext)
+EXTERN(__flashconfigbytes)
 SECTIONS
 {
 	.vectors : {
@@ -65,7 +66,7 @@ SECTIONS
 	} > vectflash
 
 	.cfmprotect : {
-		*(.cfmconfig)
+		KEEP(*(.cfmconfig))
 	} > cfmprotect
 
 	.text : {
diff --git a/configs/teensy-3.x/scripts/flash.ld b/configs/teensy-3.x/scripts/flash.ld
index 742ea90c9e..d3a7fc78ad 100644
--- a/configs/teensy-3.x/scripts/flash.ld
+++ b/configs/teensy-3.x/scripts/flash.ld
@@ -33,7 +33,7 @@
  *
  ****************************************************************************/
 
-/* The K20X256VLQ100 has 256Kb of FLASH beginning at address 0x0000:0000 and
+/* The MK20DX256VLH7 has 256Kb of FLASH beginning at address 0x0000:0000 and
  * 64Kb of SRAM beginning at address 0x1c00:0000 (SRAM_L) and 0x2000:000
  * bitband region (SRAM_U).
  *
@@ -48,7 +48,7 @@
 
 MEMORY
 {
-	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K - 16
+	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K
 	cfmprotect (rx) : ORIGIN = 0x00000400, LENGTH = 16
 	progflash (rx)  : ORIGIN = 0x00000800, LENGTH = 256K - 2K
 	datasram (rwx)  : ORIGIN = 0x1fff8000, LENGTH = 64K
@@ -56,6 +56,7 @@ MEMORY
 
 OUTPUT_ARCH(arm)
 ENTRY(_stext)
+EXTERN(__flashconfigbytes)
 SECTIONS
 {
 	.vectors : {
@@ -65,7 +66,7 @@ SECTIONS
 	} > vectflash
 
 	.cfmprotect : {
-		*(.cfmconfig)
+		KEEP(*(.cfmconfig))
 	} > cfmprotect
 
 	.text : {
diff --git a/configs/twr-k60n512/scripts/ld.script b/configs/twr-k60n512/scripts/ld.script
index 34f1527eb9..9f4f9427fe 100644
--- a/configs/twr-k60n512/scripts/ld.script
+++ b/configs/twr-k60n512/scripts/ld.script
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/twr-k60n512/scripts/ld.script
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 MEMORY
 {
-	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K - 16
+	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K
 	cfmprotect (rx) : ORIGIN = 0x00000400, LENGTH = 16
 	progflash (rx)  : ORIGIN = 0x00000800, LENGTH = 512K - 2K
 	datasram (rwx)  : ORIGIN = 0x1fff0000, LENGTH = 128K
@@ -56,6 +56,7 @@ MEMORY
 
 OUTPUT_ARCH(arm)
 ENTRY(_stext)
+EXTERN(__flashconfigbytes)
 SECTIONS
 {
 	.vectors : {
@@ -65,7 +66,7 @@ SECTIONS
 	} > vectflash
 
 	.cfmprotect : {
-		*(.cfmconfig)
+		KEEP(*(.cfmconfig))
 	} > cfmprotect
 
 	.text : {