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

	* Makefile.am, configure.ac, start/start.S: 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.

5 files changed, 12 insertions, 68 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index 5a51211415..72e8b85529 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, configure.ac, start/start.S: 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/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index b1500a141a..e43138b23b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -26,9 +26,9 @@ dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \
     startup/linkcmds.bootp
 
 startup_SOURCES = startup/alloc360.c ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
+    ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../m68k/shared/m68kpretaskinghook.c startup/bspstart.c \
+    ../../m68k/shared/m68kbspgetworkarea.c ../../shared/bspstart.c \
     startup/init68360.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac
index 8d19df6b42..97239ae7e3 100644
--- a/c/src/lib/libbsp/m68k/gen68360/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac
@@ -20,6 +20,8 @@ RTEMS_CHECK_NETWORKING
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_FPSP,[test "$RTEMS_CPU_MODEL" = "m68040"])
 
+RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/m68k/gen68360/start/start.S b/c/src/lib/libbsp/m68k/gen68360/start/start.S
index 5554ea841f..c942b8a547 100644
--- a/c/src/lib/libbsp/m68k/gen68360/start/start.S
+++ b/c/src/lib/libbsp/m68k/gen68360/start/start.S
@@ -392,8 +392,6 @@ ZEROLOOPTEST:
 	cmpl	a1,a0			| Done?
 	bcs.s	ZEROLOOP		| No, skip
 
-	movel	4(a7),_M68k_Ramsize	| Set RAM size
-
 	movel	#_stack_init,a7		| set master stack pointer
 	pea	env			| envp
 	pea	arg			| argv
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
deleted file mode 100644
index a4adf8fd3e..0000000000
--- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  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) 1989-1999.
- *  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 <string.h>
-
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <rtems/libcsupport.h>
-
-/* Amount of RAM on this board. Dynamically set in start.S */
-unsigned long _M68K_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 initialization.
- */
-
-void bsp_start( void )
-{
-  extern void *_WorkspaceBase;
-
-  /*
-   *  _M68k_Ramsize is the amount of RAM on this board and
-   *  is set by many m68k BSPs at this point.  With this
-   *  BSP, it is dynamically set in start.S.
-   */
-
-  /*
-   *  Allocate the memory for the RTEMS Work Space.  This can come from
-   *  a variety of places: hard coded address, malloc'ed from outside
-   *  RTEMS world (e.g. simulator or primitive memory manager), or (as
-   *  typically done by stock BSPs) by subtracting the required amount
-   *  of work space from the last physical address on the CPU board.
-   */
-
-  /*
-   *  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;
-}