2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am, startup/bspstart.c: Refactored and renamed
	initialization routines to rtems_initialize_data_structures,
	rtems_initialize_before_drivers, rtems_initialize_device_drivers, and
	rtems_initialize_start_multitasking. This opened the sequence up so
	that bootcard() could provide a more robust and flexible framework
	which is easier to explain and understand. This also lays the
	groundwork for sharing the division of available memory between the
	RTEMS workspace and heap and the C library initialization across all
	BSPs.

6 files changed, 27 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index 774a6b2c8b..586415c09e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-12	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, startup/bspstart.c: Refactored and renamed
+	initialization routines to rtems_initialize_data_structures,
+	rtems_initialize_before_drivers, rtems_initialize_device_drivers, and
+	rtems_initialize_start_multitasking. This opened the sequence up so
+	that bootcard() could provide a more robust and flexible framework
+	which is easier to explain and understand. This also lays the
+	groundwork for sharing the division of available memory between the
+	RTEMS workspace and heap and the C library initialization across all
+	BSPs.
+
 2008-03-03	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/linkcmds, startup/linkcmds.hsc_cm01,
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 50f65f816c..51917bc4b4 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -45,6 +45,7 @@ mpc83xx_regs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
+    ../../shared/bsppredriverhook.c \
     ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c
 
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index e22c4aabbd..28ccdf1c3d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -58,10 +58,8 @@ uint32_t   bsp_clicks_per_usec;
 
 /*
  *  Use the shared implementations of the following routines.
- *  Look in rtems/c/src/lib/libbsp/shared/bsppost.c and
- *  rtems/c/src/lib/libbsp/shared/bsplibc.c.
+ *  Look in rtems/c/src/lib/libbsp/shared/bsplibc.c.
  */
-void bsp_postdriver_hook(void);
 void bsp_libc_init( void *, uint32_t, int );
 extern void initialize_exceptions(void);
 extern void cpu_init(void);
@@ -124,12 +122,6 @@ bsp_pretasking_hook(void)
 #endif
 }
 
-
-
-void bsp_predriver_hook(void)
-{
-}
-
 void bsp_calc_mem_layout()
 {
   /*
diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
index 3dbe8e9b9f..9bd91d1437 100644
--- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-12	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, startup/bspstart.c: Refactored and renamed
+	initialization routines to rtems_initialize_data_structures,
+	rtems_initialize_before_drivers, rtems_initialize_device_drivers, and
+	rtems_initialize_start_multitasking. This opened the sequence up so
+	that bootcard() could provide a more robust and flexible framework
+	which is easier to explain and understand. This also lays the
+	groundwork for sharing the division of available memory between the
+	RTEMS workspace and heap and the C library initialization across all
+	BSPs.
+
 2008-03-03	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/linkcmds: Add wildcard to gcc_except_table section so
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 6f062aac73..7265c7ea72 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -36,6 +36,7 @@ dist_project_lib_DATA += startup/linkcmds
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
+    ../../shared/bsppredriverhook.c \
     ../../shared/sbrk.c startup/setvec.c \
     ../../shared/gnatinstallhandler.c
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
index 9417fb80f7..e3b378b3c6 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
@@ -96,7 +96,6 @@ boolean    bsp_timer_internal_clock;   /* TRUE, when timer runs with CPU clk */
  */
 
 void bsp_XAssertHandler(const char* file, int line);
-void bsp_postdriver_hook(void);
 void bsp_libc_init( void *, uint32_t, int );
 
 
@@ -105,18 +104,6 @@ void bsp_XAssertHandler(const char* file, int line) {
 }
 
 /*
- *
- *  bsp_predriver_hook
- *
- *  Before drivers are setup.
- */
-
-void bsp_predriver_hook(void)
-{
-  
-}
-
-/*
  *  Function:   bsp_pretasking_hook
  *  Created:    95/03/10
  *