diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
index 03fb2796e4..0424b72223 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds, startup/linkcmds.flash: Use top level
+	shared bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac, start/start.S, startup/linkcmds: Add use
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 69e23db968..52fc5213a7 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -37,7 +37,7 @@ dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
     startup/linkcmds.flash
 
 startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
-    ../../shared/bsppredriverhook.c ../../m68k/shared/m68kbspgetworkarea.c \
+    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppost.c ../../shared/bsppretaskinghook.c \
     ../../shared/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
index d902798f12..acc8e61f56 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
@@ -38,9 +38,9 @@ _SYS_CLOCK_FREQUENCY = DEFINED(_SYS_CLOCK_FREQUENCY) ?
  * A heap size of 0 means "Use all available memory for the heap".
  * Initial stack located in on-chip SRAM and not declared there.
  */
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
-_RamBase = DEFINED(_RamBase) ? _RamBase : 0x30000000;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 0x00100000;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
+RamBase = DEFINED(RamBase) ? RamBase : 0x30000000;
+RamSize = DEFINED(RamSize) ? RamSize : 0x00100000;
 
 /*
  * Setup the memory map of the MCF5206eLITE evaluation board
@@ -67,8 +67,8 @@ SECTIONS
    * Dynamic RAM
    */
   ram : {
-          _RamBase = .;
-          __RamBase = .;
+          RamBase = .;
+          RamBase = .;
           /* Reserve space for interrupt table */
           . += 0x400;
   } >ram 
@@ -167,8 +167,8 @@ SECTIONS
     
     clear_end = .;
 
-    _WorkspaceBase = .;
-    __WorkspaceBase = .;
+    WorkAreaBase = .;
+    WorkAreaBase = .;
 
   } > ram
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash
index 029a9558d3..0b3b2e67a9 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash
@@ -31,7 +31,7 @@
  * A heap size of 0 means "Use all available memory for the heap".
  * Initial stack located in on-chip SRAM and not declared there.
  */
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 /*
  * Declare system clock frequency.
@@ -69,8 +69,8 @@ SECTIONS
    * Dynamic RAM
    */
   ram : {
-          _RamBase = .;
-          __RamBase = .;
+          RamBase = .;
+          RamBase = .;
   } >ram 
 
   /*
@@ -167,8 +167,8 @@ SECTIONS
     
     clear_end = .;
 
-    _WorkspaceBase = .;
-    __WorkspaceBase = .;
+    WorkAreaBase = .;
+    WorkAreaBase = .;
 
   } > ram