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

	* Makefile.am, configure.ac, start/start.S, 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
	rtems/libio.h and rtems/libcsupport.h.
	* startup/bspstart.c: Removed.

6 files changed, 22 insertions, 67 deletions

diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
index 6eea7c971d..03fb2796e4 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, configure.ac, start/start.S, 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
+	rtems/libio.h and rtems/libcsupport.h.
+	* startup/bspstart.c: Removed.
+
 2008-09-10	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, include/bsp.h: Review of all bsp_cleanup()
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index dacfa0a2f4..69e23db968 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -37,9 +37,9 @@ dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
     startup/linkcmds.flash
 
 startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
-    startup/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
+    ../../shared/bsppredriverhook.c ../../m68k/shared/m68kbspgetworkarea.c \
+    ../../shared/bsppost.c ../../shared/bsppretaskinghook.c \
+    ../../shared/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
 console_SOURCES = console/console.c ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
index 1551484ab9..c588f6f57c 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
@@ -17,6 +17,8 @@ RTEMS_PROG_CCAS
 
 RTEMS_CHECK_NETWORKING
 
+RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+
 AC_CONFIG_SUBDIRS(tools)
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
index cace337ace..065b3dff7f 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
@@ -352,7 +352,6 @@ ZEROLOOPTEST:
 	cmpl	a1,a0			| Done?
 	bcs.s	ZEROLOOP		| No, skip
 	move	4(a7),d0
-	move	d0,_M68k_Ramsize        | Set Ram Size
 
 	/*
 	 * Right : Now we're ready to boot RTEMS
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
deleted file mode 100644
index 3552314d3d..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  BSP startup
- *
- *  This routine starts the application.  It includes application,
- *  board, and monitor specific initialization and configuration.
- *  The generic CPU dependent initialization has been performed
- *  before this routine is invoked.
- *
- *  Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia
- *  Author: Victor V. Vengerov <vvv@oktet.ru>
- *
- *  Based on work:
- *  Author:
- *    David Fiddes, D.J@fiddes.surfaid.org
- *    http://www.calm.hw.ac.uk/davidf/coldfire/
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <rtems/libio.h>
-
-#include <rtems/libcsupport.h>
-
-#include <string.h>
-
-unsigned long _RamSize;
-
-/*
- *  Use the shared implementations of the following routines
- */
-
-void bsp_libc_init( void *, uint32_t, int );
-void bsp_pretasking_hook(void);               /* m68k version */
-
-/* bsp_start --
- *     This routine does the bulk of the system initialisation.
- */
-void bsp_start( void )
-{
-  extern void *_WorkspaceBase;
-
-  /*
-   *  Need to "allocate" the memory for the RTEMS Workspace and
-   *  tell the RTEMS configuration where it is.  This memory is
-   *  not malloc'ed.  It is just "pulled from the air".
-   */
-
-  Configuration.work_space_start = (void *)&_WorkspaceBase;
-}
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
index 3332a7c824..d902798f12 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
@@ -26,17 +26,21 @@
  *      number used there is not constant.  If this happens to you, edit
  *      the lines marked XXX below to use a constant value.
  */
+
+/*
+ * Declare system clock frequency.
+ */
+_SYS_CLOCK_FREQUENCY = DEFINED(_SYS_CLOCK_FREQUENCY) ?
+                               _SYS_CLOCK_FREQUENCY : 54000000;
+
 /*
  * Declare size of heap.
  * 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;
-
-/*
- * Declare system clock frequency.
- */
-_SYS_CLOCK_FREQUENCY = DEFINED(_SYS_CLOCK_FREQUENCY) ? _SYS_CLOCK_FREQUENCY : 54000000;
+_RamBase = DEFINED(_RamBase) ? _RamBase : 0x30000000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 0x00100000;
 
 /*
  * Setup the memory map of the MCF5206eLITE evaluation board