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

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

4 files changed, 13 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
index 9e81791dcc..25abaa261f 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* Makefile.am, start/start.S, 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: 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/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 8f6ad221fc..ebd477bbf2 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \
+    ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
     startup/init52235.c startup/bspstart.c startup/cfinit.c\
     ../../shared/bootcard.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/start/start.S b/c/src/lib/libbsp/m68k/mcf52235/start/start.S
index 386924c0d3..03a0091b1b 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/start/start.S
+++ b/c/src/lib/libbsp/m68k/mcf52235/start/start.S
@@ -355,7 +355,7 @@ SYM(start):
     move.l  d1, d7
 
     /* Initialize RAMBAR: locate SRAM and validate it */
-    move.l  #_RamBase, d0
+    move.l  #RamBase, d0
     add.l   #0x21, d0
     movec   d0, %rambar
 
@@ -405,7 +405,7 @@ _change_flashbar:
     * If running in SRAM, change_flashbar should not be executed 
     */
 
-    move.l  #_RamBase, a0
+    move.l  #RamBase, a0
 
     /* Code "move.l #(__FLASH + 0x61),d0" into SRAM */
     move.w  #0x203C, d0
@@ -425,7 +425,7 @@ _change_flashbar:
     move.l  d0, (a0)+
 
     /* Jump to code segment in internal SRAM */
-    jmp     _RamBase
+    jmp     RamBase
 
 END_CODE
 
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds
index a61e000a59..25642bd90a 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds
@@ -15,9 +15,9 @@
 /*
  * Declare some sizes.
  */
-_RamBase = DEFINED(_RamBase) ? _RamBase : 0x20000000;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 32K;
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
+RamBase = DEFINED(RamBase) ? RamBase : 0x20000000;
+RamSize = DEFINED(RamSize) ? RamSize : 32K;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x400;
 _FlashBase = DEFINED(_FlashBase) ? _FlashBase : 0x00000000;
 
@@ -158,7 +158,7 @@ SECTIONS
         . += _StackSize;
         . = ALIGN (16);
         PROVIDE(_StackInit = .);
-        PROVIDE(_WorkspaceBase = .);
+        PROVIDE(WorkAreaBase = .);
     } >sram
 
     /* Stabs debugging sections.  */