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

	* Makefile.am, 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 rtems/libio.h and
	rtems/libcsupport.h.
	* startup/bspgetworkarea.c: New file.

4 files changed, 56 insertions, 25 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index 60e2987b24..475b98b9e9 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, 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 rtems/libio.h and
+	rtems/libcsupport.h.
+	* startup/bspgetworkarea.c: New file.
+
 2008-09-10	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* include/bsp.h: Review of all bsp_cleanup() implementations. In this
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index a43209729f..7f222abd1e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -54,6 +54,7 @@ startup_SOURCES = ../../shared/bsplibc.c \
 	startup/cpuinit.c \
 	startup/bspstart.c \
 	startup/bspclean.c \
+	startup/bspgetworkarea.c \
         startup/uboot_support.c \
         ../shared/uboot_getenv.c
 
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspgetworkarea.c
new file mode 100644
index 0000000000..3e052ee2ce
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspgetworkarea.c
@@ -0,0 +1,47 @@
+/**
+ * @file
+ *
+ * @ingroup mpc83xx
+ *
+ * @brief Source for BSP startup code.
+ */
+
+/*
+ * Copyright (c) 2008
+ * Embedded Brains GmbH
+ * Obere Lagerstr. 30
+ * D-82178 Puchheim
+ * Germany
+ * rtems@embedded-brains.de
+ *
+ * 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 <bsp/bootcard.h>
+
+#ifdef HAS_UBOOT
+  extern bd_t mpc83xx_uboot_board_info;
+#endif /* HAS_UBOOT */
+
+void bsp_get_work_area(
+  void   **work_area_start,
+  size_t  *work_area_size,
+  void   **heap_start,
+  size_t  *heap_size)
+{
+  #ifdef HAS_UBOOT
+    char *ram_end = (char *) mpc83xx_uboot_board_info.bi_memstart +
+				   mpc83xx_uboot_board_info.bi_memsize;
+  #else /* HAS_UBOOT */
+    char *ram_end = bsp_ram_end;
+  #endif /* HAS_UBOOT */
+
+  *work_area_start = bsp_work_area_start;
+  *work_area_size = ram_end - bsp_work_area_start;
+  *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
+  *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
+}
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index ea5df3e875..46ef22ac75 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -20,12 +20,6 @@
  * $Id$
  */
 
-#include <string.h>
-
-#include <rtems/libio.h>
-#include <rtems/libcsupport.h>
-#include <rtems/score/thread.h>
-
 #include <libcpu/powerpc-utility.h>
 #include <libcpu/raw_exception.h>
 
@@ -87,25 +81,6 @@ void _BSP_Fatal_error(unsigned n)
   }
 }
 
-void bsp_get_work_area(
-  void   **work_area_start,
-  size_t  *work_area_size,
-  void   **heap_start,
-  size_t  *heap_size)
-{
-#ifdef HAS_UBOOT
-  char *ram_end = (char *) mpc83xx_uboot_board_info.bi_memstart +
-                                 mpc83xx_uboot_board_info.bi_memsize;
-#else /* HAS_UBOOT */
-  char *ram_end = bsp_ram_end;
-#endif /* HAS_UBOOT */
-
-  *work_area_start = bsp_work_area_start;
-  *work_area_size = ram_end - bsp_work_area_start;
-  *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
-  *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
-
 void bsp_start( void)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;