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

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

4 files changed, 16 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
index bd85fd9d00..cc318b181f 100644
--- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* Makefile.am, startup/bspstart.c, startup/linkcmds: Use top level
+	shared bsp_get_work_area() implementation.
+
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add
 	use of bsp_get_work_area() in its own file and rely on BSP Framework
 	to perform more initialization. Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index e3355bb96b..b5279aec30 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
-    ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \
+    ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
     startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
index 289e4b836f..9beedc2c18 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
@@ -31,8 +31,8 @@
 /*
  * Linker Script Defined Variables
  */
-extern char _RamSize[];
-extern char _RamBase[];
+extern char RamSize[];
+extern char RamBase[];
 
 /*
  * CPU-space access
@@ -203,8 +203,8 @@ static void handler(int pc)
     for(;;) {
         int *nfp = (int *)*fp;
         if ((nfp <= fp)
-         || ((char *)nfp >= _RamSize)
-         || ((char *)(nfp[1]) >= _RamSize))
+         || ((char *)nfp >= RamSize)
+         || ((char *)(nfp[1]) >= RamSize))
             break;
         printk("FP:%x -> %x    PC:%x\n", fp, nfp, nfp[1]);
         fp = nfp;
@@ -240,8 +240,8 @@ void bsp_start( void )
   /*
    * Cache SDRAM
    */
-  mcf5282_acr0_mode = MCF5XXX_ACR_AB((uint32_t)_RamBase)     |
-                      MCF5XXX_ACR_AM((uint32_t)_RamSize-1)   |
+  mcf5282_acr0_mode = MCF5XXX_ACR_AB((uint32_t)RamBase)     |
+                      MCF5XXX_ACR_AM((uint32_t)RamSize-1)   |
                       MCF5XXX_ACR_EN                         |
                       MCF5XXX_ACR_BWE                        |
                       MCF5XXX_ACR_SM_IGNORE;
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds
index 6c82f6d91a..58e3c6155f 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds
@@ -17,9 +17,9 @@
 /*
  * Declare some locations and sizes.
  */
-_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 16M;
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0;
+RamBase = DEFINED(RamBase) ? RamBase : 0x0;
+RamSize = DEFINED(RamSize) ? RamSize : 16M;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0;
 _FlashBase = DEFINED(_FlashBase) ? _FlashBase : 0x10000000;
 _FlashSize = DEFINED(_FlashSize) ? _FlashSize : 4M ;
 
@@ -166,7 +166,7 @@ SECTIONS
         . = ALIGN (16);
         PROVIDE (end = .);
         _clear_end = .;
-        _WorkspaceBase = .;
+        WorkAreaBase = .;
     } >ram
 
   /* Stabs debugging sections.  */