From b00b46a986a50e0e75c528464e382166a5eca6e8 Mon Sep 17 00:00:00 2001
From: GustavWi <Gustav.Wiklander@iar.com>
Date: Thu, 27 Nov 2014 13:47:19 +0100
Subject: [PATCH] Override default linker file for devices (was not needed
 before NVIC table ram space in icf file

---
 workspace_tools/export/iar_k20d50m.ewp.tmpl       | 4 ++--
 workspace_tools/export/iar_k22f.ewp.tmpl          | 4 ++--
 workspace_tools/export/iar_k64f.ewp.tmpl          | 4 ++--
 workspace_tools/export/iar_kl05z.ewp.tmpl         | 4 ++--
 workspace_tools/export/iar_kl25z.ewp.tmpl         | 4 ++--
 workspace_tools/export/iar_kl46z.ewp.tmpl         | 4 ++--
 workspace_tools/export/iar_lpc1114.ewp.tmpl       | 4 ++--
 workspace_tools/export/iar_lpc11u24.ewp.tmpl      | 4 ++--
 workspace_tools/export/iar_lpc11u35_401.ewp.tmpl  | 4 ++--
 workspace_tools/export/iar_lpc11u35_501.ewp.tmpl  | 4 ++--
 workspace_tools/export/iar_lpc1347.ewp.tmpl       | 4 ++--
 workspace_tools/export/iar_lpc1549.ewp.tmpl       | 4 ++--
 workspace_tools/export/iar_lpc4088.ewp.tmpl       | 4 ++--
 workspace_tools/export/iar_lpc812.ewp.tmpl        | 4 ++--
 workspace_tools/export/iar_lpccappuccino.ewp.tmpl | 4 ++--
 workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl | 4 ++--
 workspace_tools/export/iar_stm32f407.ewp.tmpl     | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/workspace_tools/export/iar_k20d50m.ewp.tmpl b/workspace_tools/export/iar_k20d50m.ewp.tmpl
index 218213e3d8..bf6c02ec8f 100644
--- a/workspace_tools/export/iar_k20d50m.ewp.tmpl
+++ b/workspace_tools/export/iar_k20d50m.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MK20xX128_5.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_k22f.ewp.tmpl b/workspace_tools/export/iar_k22f.ewp.tmpl
index 08faf051a5..8c09290be2 100644
--- a/workspace_tools/export/iar_k22f.ewp.tmpl
+++ b/workspace_tools/export/iar_k22f.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MK22xN512_12.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_k64f.ewp.tmpl b/workspace_tools/export/iar_k64f.ewp.tmpl
index 7151aaca30..4773a7f495 100644
--- a/workspace_tools/export/iar_k64f.ewp.tmpl
+++ b/workspace_tools/export/iar_k64f.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MK64xN1M_12.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_kl05z.ewp.tmpl b/workspace_tools/export/iar_kl05z.ewp.tmpl
index 8b269fa462..aaa2ac8bb9 100644
--- a/workspace_tools/export/iar_kl05z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl05z.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MKL05Z32xxx4.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_kl25z.ewp.tmpl b/workspace_tools/export/iar_kl25z.ewp.tmpl
index 4e4e6fb781..15cc1a6ed0 100644
--- a/workspace_tools/export/iar_kl25z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl25z.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MKL25Z128xxx4.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_kl46z.ewp.tmpl b/workspace_tools/export/iar_kl46z.ewp.tmpl
index 2177c9792e..b763e5ddef 100644
--- a/workspace_tools/export/iar_kl46z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl46z.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\Freescale\MKL46Z256xxx4.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc1114.ewp.tmpl b/workspace_tools/export/iar_lpc1114.ewp.tmpl
index 557f5f1747..325a03db81 100644
--- a/workspace_tools/export/iar_lpc1114.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1114.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc11u24.ewp.tmpl b/workspace_tools/export/iar_lpc11u24.ewp.tmpl
index 3c34a684ea..e7d2fd77a7 100644
--- a/workspace_tools/export/iar_lpc11u24.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u24.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U68JBD100.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl b/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
index fac4b1995f..e65bd1335f 100644
--- a/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl b/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
index b2d9ba9422..3764462aa7 100644
--- a/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc1347.ewp.tmpl b/workspace_tools/export/iar_lpc1347.ewp.tmpl
index 706f766415..c9b1c5e373 100644
--- a/workspace_tools/export/iar_lpc1347.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1347.ewp.tmpl
@@ -712,11 +712,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc1347.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc1549.ewp.tmpl b/workspace_tools/export/iar_lpc1549.ewp.tmpl
index 107efbe483..37a0b9c9a9 100644
--- a/workspace_tools/export/iar_lpc1549.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1549.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc4088.ewp.tmpl b/workspace_tools/export/iar_lpc4088.ewp.tmpl
index 36ab1598f1..a7b5b7eee3 100644
--- a/workspace_tools/export/iar_lpc4088.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc4088.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpc812.ewp.tmpl b/workspace_tools/export/iar_lpc812.ewp.tmpl
index e49b2dabf9..28fce73c7a 100644
--- a/workspace_tools/export/iar_lpc812.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc812.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_lpccappuccino.ewp.tmpl b/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
index 33290acc8f..93e861c6b2 100644
--- a/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
+++ b/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\LPC11U24FBD64_401.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl b/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
index 3c77a93b48..c51273cd93 100644
--- a/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\ST\stm32f103xB.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/workspace_tools/export/iar_stm32f407.ewp.tmpl b/workspace_tools/export/iar_stm32f407.ewp.tmpl
index 5ac0703f0f..7086095f87 100644
--- a/workspace_tools/export/iar_stm32f407.ewp.tmpl
+++ b/workspace_tools/export/iar_stm32f407.ewp.tmpl
@@ -707,11 +707,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\ST\stm32f407xG.icf</state>
+          <state>$PROJ_DIR$\{{linker_script}}</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>