2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, startup/linkcmds, startup/linkcmds.ram,
	startup/linkcmds.rom: Use top level shared bsp_get_work_area()
	implementation.

5 files changed, 17 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 3f8e11a3a7..4531607e8a 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds, startup/linkcmds.ram,
+	startup/linkcmds.rom: Use top level shared bsp_get_work_area()
+	implementation.
+
 2008-09-15	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac, include/bsp.h, startup/linkcmds: Use
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index beb9d4ae2e..32e242e4c9 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -37,7 +37,7 @@ CLEANFILES = scitab.c
 startup_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
     ../shared/bspstart.c ../../shared/bsppretaskinghook.c \
-    ../shared/bspgetworkarea.c ../../shared/sbrk.c ../../shared/bootcard.c \
+    ../../shared/bspgetworkarea.c ../../shared/sbrk.c ../../shared/bootcard.c \
     ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \
     ../shared/bsphwinit.c
 scitab_SOURCES = scitab.c
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds
index ab6e975368..098b04cf07 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds
+++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds
@@ -46,6 +46,7 @@ ENTRY(_start)
 
 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x00440000;
 _RamSize = DEFINED(_RamSize) ? _RamSize : 512K;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
 
 MEMORY
 {
@@ -190,7 +191,7 @@ SECTIONS
   _end = . ;
   PROVIDE (end = .);
 
-  _WorkSpaceStart = . ;
+  _WorkAreaBase = . ;
 
   _CPU_Interrupt_stack_low  = 0xFFFFF000;
   _CPU_Interrupt_stack_high = 0xFFFFFFFF;
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram
index c710f2623a..ec711a932e 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram
+++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram
@@ -44,6 +44,9 @@ OUTPUT_ARCH(sh)
 ENTRY(_start)
 
 /* These assignments load code into SH7045F EVB SRAM for monitor debugging */
+_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00440000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 512K;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
 
 MEMORY
 {
@@ -181,13 +184,8 @@ SECTIONS
   _end = . ;
   PROVIDE (end = .);
 
-  _HeapStart = . ;
-  . = . + 1024 * 20 ;
-  PROVIDE( _HeapEnd = . );
-
-  _WorkSpaceStart = . ;
+  _WorkAreaBase = . ;
   . = 0x00480000 ;
-  PROVIDE(_WorkSpaceEnd = .);
 
   _CPU_Interrupt_stack_low  = 0xFFFFF000;
   _CPU_Interrupt_stack_high = 0xFFFFFFFF;
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom
index e59598dbf9..1bf5be7120 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom
+++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom
@@ -44,6 +44,9 @@ OUTPUT_ARCH(sh)
 ENTRY(_start)
 
 /* These asignments represent actual SH7045F EVB architecture */
+_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00400000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 0x0008000;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
 
 MEMORY
 {
@@ -186,9 +189,7 @@ SECTIONS
   . = . + 1024 * 20 ;
   PROVIDE( _HeapEnd = . );
 
-  _WorkSpaceStart = . ;
-  . = 0x00480000 ;
-  PROVIDE(_WorkSpaceEnd = .);
+  _WorkAreaBase = . ;
 
   _CPU_Interrupt_stack_low  = 0xFFFFF000;
   _CPU_Interrupt_stack_high = 0xFFFFFFFF;