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

	* Makefile.am, startup/bspstart.c: Split out bsp_get_work_area() into
	its own file and use BSP Framework to perform more initialization.
	* startup/bspgetworkarea.c: New file.

4 files changed, 51 insertions, 23 deletions

diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
index b235175f31..787f2641c7 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/bspstart.c: Split out bsp_get_work_area() into
+	its own file and use BSP Framework to perform more initialization.
+	* startup/bspgetworkarea.c: New file.
+
 2008-09-09	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* console/console.c: added printk support
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 08489adc8d..7094612a53 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -56,9 +56,9 @@ console_SOURCES = console/console.c
 timer_SOURCES = timer/timer.c
 startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    startup/mmutlbtab.c startup/cpuinit.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+    ../../shared/bsppretaskinghook.c startup/bspstart.c \
+    startup/bspgetworkarea.c ../../shared/bootcard.c startup/mmutlbtab.c \
+    startup/cpuinit.c ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspgetworkarea.c
new file mode 100644
index 0000000000..ec608ae912
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspgetworkarea.c
@@ -0,0 +1,41 @@
+/**
+ * @file
+ *
+ * @ingroup tqm8xx
+ *
+ * @brief Source for BSP Get Work Area Memory
+ */
+
+/*
+ * 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 <libcpu/powerpc-utility.h>
+
+#include <bsp.h>
+#include <bsp/bootcard.h>
+
+void bsp_get_work_area(
+  void **work_area_start,
+  size_t *work_area_size,
+  void **heap_start,
+  size_t *heap_size
+)
+{
+  char *ram_end = (char *) (TQM_BD_INFO.sdram_size - (uint32_t)TopRamReserved);
+
+  *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/tqm8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
index 04647b9f02..c6b930e534 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
@@ -20,11 +20,7 @@
  * $Id$
  */
 
-#include <string.h>
-
-#include <rtems/libio.h>
-#include <rtems/libcsupport.h>
-#include <rtems/score/thread.h>
+#include <rtems.h>
 
 #include <libcpu/powerpc-utility.h>
 
@@ -81,11 +77,6 @@ void _BSP_Fatal_error( unsigned n)
   }
 }
 
-void bsp_pretasking_hook( void)
-{
-  /* Do noting */
-}
-
 const char *bsp_tqm_get_cib_string( const char *cib_id)
 {
   char srch_pattern[10] = "";
@@ -132,16 +123,6 @@ rtems_status_code  bsp_tqm_get_cib_uint32( const char *cib_id,
   return RTEMS_SUCCESSFUL;
 }
 
-void bsp_get_work_area( void **work_area_start, size_t *work_area_size, void **heap_start, size_t *heap_size)
-{
-  char *ram_end = (char *) (TQM_BD_INFO.sdram_size - (uint32_t)TopRamReserved);
-
-  *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)
 {
   ppc_cpu_id_t myCpu;