From bbb7949f5725f2853bd4e34b0a6685251bd25259 Mon Sep 17 00:00:00 2001
From: Drew Barbier <dbarbi1@gmail.com>
Date: Thu, 15 Jun 2017 10:37:33 -0500
Subject: E31 linker script update

---
 FreedomStudio/E31FPGA/coreplexip_welcome/.cproject   |  2 +-
 FreedomStudio/E31FPGA/coreplexip_welcome/.project    | 13 +++++++++----
 FreedomStudio/E31FPGA/global_interrupts/.cproject    |  2 +-
 FreedomStudio/E31FPGA/global_interrupts/.project     | 13 +++++++++----
 FreedomStudio/E31FPGA/local_interrupts/.cproject     |  2 +-
 FreedomStudio/E31FPGA/local_interrupts/.project      | 13 +++++++++----
 FreedomStudio/E31FPGA/performance_counters/.cproject |  4 ++--
 FreedomStudio/E31FPGA/performance_counters/.project  | 13 +++++++++----
 8 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/FreedomStudio/E31FPGA/coreplexip_welcome/.cproject b/FreedomStudio/E31FPGA/coreplexip_welcome/.cproject
index 138e38b..53908ce 100644
--- a/FreedomStudio/E31FPGA/coreplexip_welcome/.cproject
+++ b/FreedomStudio/E31FPGA/coreplexip_welcome/.cproject
@@ -91,7 +91,7 @@
 								</option>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other.724386459" name="Other linker flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other" useByScannerDiscovery="false" value="-Wl,--start-group -Wl,--end-group -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=open -Wl,--wrap=lseek -Wl,--wrap=read -Wl,--wrap=write -Wl,--wrap=fstat -Wl,--wrap=stat -Wl,--wrap=close -Wl,--wrap=link -Wl,--wrap=unlink -Wl,--wrap=execve -Wl,--wrap=fork -Wl,--wrap=getpid -Wl,--wrap=kill -Wl,--wrap=wait -Wl,--wrap=isatty -Wl,--wrap=times -Wl,--wrap=sbrk -Wl,--wrap=_exit" valueType="string"/>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile.1308651449" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/link.lds}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/flash.lds}&quot;"/>
 								</option>
 								<inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input.1622617219" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
diff --git a/FreedomStudio/E31FPGA/coreplexip_welcome/.project b/FreedomStudio/E31FPGA/coreplexip_welcome/.project
index 56e0a73..1a7b40a 100644
--- a/FreedomStudio/E31FPGA/coreplexip_welcome/.project
+++ b/FreedomStudio/E31FPGA/coreplexip_welcome/.project
@@ -135,14 +135,14 @@
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/drivers/plic/plic_driver.h</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/init.c</name>
+			<name>bsp/env/coreplexip-e31-arty/flash.lds</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/flash.lds</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/link.lds</name>
+			<name>bsp/env/coreplexip-e31-arty/init.c</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/link.lds</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
 		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/openocd.cfg</name>
@@ -154,6 +154,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/platform.h</locationURI>
 		</link>
+		<link>
+			<name>bsp/env/coreplexip-e31-arty/scratchpad.lds</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/scratchpad.lds</locationURI>
+		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/settings.mk</name>
 			<type>1</type>
diff --git a/FreedomStudio/E31FPGA/global_interrupts/.cproject b/FreedomStudio/E31FPGA/global_interrupts/.cproject
index eb2ebc7..4c984ec 100644
--- a/FreedomStudio/E31FPGA/global_interrupts/.cproject
+++ b/FreedomStudio/E31FPGA/global_interrupts/.cproject
@@ -91,7 +91,7 @@
 								</option>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other.724386459" name="Other linker flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other" useByScannerDiscovery="false" value="-Wl,--start-group -Wl,--end-group -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=open -Wl,--wrap=lseek -Wl,--wrap=read -Wl,--wrap=write -Wl,--wrap=fstat -Wl,--wrap=stat -Wl,--wrap=close -Wl,--wrap=link -Wl,--wrap=unlink -Wl,--wrap=execve -Wl,--wrap=fork -Wl,--wrap=getpid -Wl,--wrap=kill -Wl,--wrap=wait -Wl,--wrap=isatty -Wl,--wrap=times -Wl,--wrap=sbrk -Wl,--wrap=_exit" valueType="string"/>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile.1308651449" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/link.lds}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/flash.lds}&quot;"/>
 								</option>
 								<inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input.1622617219" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
diff --git a/FreedomStudio/E31FPGA/global_interrupts/.project b/FreedomStudio/E31FPGA/global_interrupts/.project
index 17a6959..c0fb9aa 100644
--- a/FreedomStudio/E31FPGA/global_interrupts/.project
+++ b/FreedomStudio/E31FPGA/global_interrupts/.project
@@ -135,14 +135,14 @@
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/drivers/plic/plic_driver.h</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/init.c</name>
+			<name>bsp/env/coreplexip-e31-arty/flash.lds</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/flash.lds</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/link.lds</name>
+			<name>bsp/env/coreplexip-e31-arty/init.c</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/link.lds</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
 		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/openocd.cfg</name>
@@ -154,6 +154,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/platform.h</locationURI>
 		</link>
+		<link>
+			<name>bsp/env/coreplexip-e31-arty/scratchpad.lds</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/scratchpad.lds</locationURI>
+		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/settings.mk</name>
 			<type>1</type>
diff --git a/FreedomStudio/E31FPGA/local_interrupts/.cproject b/FreedomStudio/E31FPGA/local_interrupts/.cproject
index eb2ebc7..4c984ec 100644
--- a/FreedomStudio/E31FPGA/local_interrupts/.cproject
+++ b/FreedomStudio/E31FPGA/local_interrupts/.cproject
@@ -91,7 +91,7 @@
 								</option>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other.724386459" name="Other linker flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other" useByScannerDiscovery="false" value="-Wl,--start-group -Wl,--end-group -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=open -Wl,--wrap=lseek -Wl,--wrap=read -Wl,--wrap=write -Wl,--wrap=fstat -Wl,--wrap=stat -Wl,--wrap=close -Wl,--wrap=link -Wl,--wrap=unlink -Wl,--wrap=execve -Wl,--wrap=fork -Wl,--wrap=getpid -Wl,--wrap=kill -Wl,--wrap=wait -Wl,--wrap=isatty -Wl,--wrap=times -Wl,--wrap=sbrk -Wl,--wrap=_exit" valueType="string"/>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile.1308651449" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/link.lds}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/flash.lds}&quot;"/>
 								</option>
 								<inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input.1622617219" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
diff --git a/FreedomStudio/E31FPGA/local_interrupts/.project b/FreedomStudio/E31FPGA/local_interrupts/.project
index 4e23341..dd95bf1 100644
--- a/FreedomStudio/E31FPGA/local_interrupts/.project
+++ b/FreedomStudio/E31FPGA/local_interrupts/.project
@@ -135,14 +135,14 @@
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/drivers/plic/plic_driver.h</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/init.c</name>
+			<name>bsp/env/coreplexip-e31-arty/flash.lds</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/flash.lds</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/link.lds</name>
+			<name>bsp/env/coreplexip-e31-arty/init.c</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/link.lds</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
 		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/openocd.cfg</name>
@@ -154,6 +154,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/platform.h</locationURI>
 		</link>
+		<link>
+			<name>bsp/env/coreplexip-e31-arty/scratchpad.lds</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/scratchpad.lds</locationURI>
+		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/settings.mk</name>
 			<type>1</type>
diff --git a/FreedomStudio/E31FPGA/performance_counters/.cproject b/FreedomStudio/E31FPGA/performance_counters/.cproject
index 9b1ceb4..12de282 100644
--- a/FreedomStudio/E31FPGA/performance_counters/.cproject
+++ b/FreedomStudio/E31FPGA/performance_counters/.cproject
@@ -61,7 +61,7 @@
 								<inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.assembler.input.31099272" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.assembler.input"/>
 							</tool>
 							<tool id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.compiler.424460842" name="GNU RISC-V Cross C Compiler" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.compiler">
-								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.defs.1682056018" name="Defined symbols (-D)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"/>
+								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.defs.1682056018" name="Defined symbols (-D)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.defs" useByScannerDiscovery="true"/>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.include.paths.798701398" name="Include paths (-I)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
 									<listOptionValue builtIn="false" value="../bsp/drivers"/>
 									<listOptionValue builtIn="false" value="../bsp/env"/>
@@ -89,7 +89,7 @@
 								</option>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other.724386459" name="Other linker flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.other" useByScannerDiscovery="false" value="-Wl,--start-group -Wl,--end-group -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=open -Wl,--wrap=lseek -Wl,--wrap=read -Wl,--wrap=write -Wl,--wrap=fstat -Wl,--wrap=stat -Wl,--wrap=close -Wl,--wrap=link -Wl,--wrap=unlink -Wl,--wrap=execve -Wl,--wrap=fork -Wl,--wrap=getpid -Wl,--wrap=kill -Wl,--wrap=wait -Wl,--wrap=isatty -Wl,--wrap=times -Wl,--wrap=sbrk -Wl,--wrap=_exit" valueType="string"/>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile.1308651449" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/link.lds}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/bsp/env/coreplexip-e31-arty/flash.lds}&quot;"/>
 								</option>
 								<inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input.1622617219" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
diff --git a/FreedomStudio/E31FPGA/performance_counters/.project b/FreedomStudio/E31FPGA/performance_counters/.project
index 510a819..8d65d9a 100644
--- a/FreedomStudio/E31FPGA/performance_counters/.project
+++ b/FreedomStudio/E31FPGA/performance_counters/.project
@@ -135,14 +135,14 @@
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/drivers/plic/plic_driver.h</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/init.c</name>
+			<name>bsp/env/coreplexip-e31-arty/flash.lds</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/flash.lds</locationURI>
 		</link>
 		<link>
-			<name>bsp/env/coreplexip-e31-arty/link.lds</name>
+			<name>bsp/env/coreplexip-e31-arty/init.c</name>
 			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/link.lds</locationURI>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/init.c</locationURI>
 		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/openocd.cfg</name>
@@ -154,6 +154,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/platform.h</locationURI>
 		</link>
+		<link>
+			<name>bsp/env/coreplexip-e31-arty/scratchpad.lds</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/bsp/env/coreplexip-e31-arty/scratchpad.lds</locationURI>
+		</link>
 		<link>
 			<name>bsp/env/coreplexip-e31-arty/settings.mk</name>
 			<type>1</type>
-- 
cgit v1.2.1-18-gbd029