bsps/virtex*: Use default bsp_pretasking_hook()

Update #2408.

6 files changed, 4 insertions, 36 deletions

diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 1215d7470e..d4a12a1245 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -32,6 +32,7 @@ libbsp_a_SOURCES = startup/bspclean.c \
                    ../shared/startup/zerobss.c \
                    ../../shared/bsplibc.c \
                    ../../shared/bspgetworkarea.c \
+                   ../../shared/bsppretaskinghook.c \
                    ../../shared/bsppost.c \
                    startup/bspstart.c \
                    ../../shared/bootcard.c \
diff --git a/c/src/lib/libbsp/powerpc/virtex4/start/start.S b/c/src/lib/libbsp/powerpc/virtex4/start/start.S
index 55d53183a4..e2c4534771 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/start/start.S
+++ b/c/src/lib/libbsp/powerpc/virtex4/start/start.S
@@ -284,7 +284,7 @@ startupBL:
         * PowerPC EABI.
         *
         * boot_card() supervises the initialization of RTEMS and the C
-        * library.  It calls bsp_start(), bsp_pretasking_hook(), etc.
+        * library.  It calls bsp_start(), bsp_predriver_hook(), etc.
         *------------------------------------------------------------------*/
         lwz     r2,toc_pointer-base_addr(r1)        /* set r2 to toc */
         lwz     r1,stack_top-base_addr(r1)          /* set r1 to stack_top */
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
index 5a2d88df75..f4a5ced6af 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
@@ -109,9 +109,6 @@ static void _noopfun(void) {}
 void app_bsp_start(void)
 __attribute__(( weak, alias("_noopfun") ));
 
-void app_bsp_pretasking_hook(void)
-__attribute__(( weak, alias("_noopfun") ));
-
 void app_bsp_predriver_hook(void)
 __attribute__(( weak, alias("_noopfun") ));
 
@@ -235,20 +232,6 @@ void bsp_start(void)
 
 
 /*
- *  BSP pretasking hook.  Called just before drivers are initialized.
- *  Used to setup libc and install any BSP extensions.
- *
- *  Must not use libc (to do io) from here, since drivers are not yet
- *  initialized.
- */
-
-void bsp_pretasking_hook(void)
-{
-  app_bsp_pretasking_hook();
-}
-
-
-/*
  *  BSP predriver hook.  Called by boot_card() just before drivers are
  *  initialized.  Clear out any stale interrupts here.
  */
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 09231d2b55..3bdc713e58 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -31,6 +31,7 @@ libbsp_a_SOURCES = startup/bspclean.c \
                    ../shared/startup/zerobss.c \
                    ../../shared/bsplibc.c \
                    ../../shared/bspgetworkarea.c \
+                   ../../shared/bsppretaskinghook.c \
                    ../../shared/bsppost.c \
                    startup/bspstart.c \
                    ../../shared/bootcard.c \
diff --git a/c/src/lib/libbsp/powerpc/virtex5/start/start.S b/c/src/lib/libbsp/powerpc/virtex5/start/start.S
index 40938e55ab..2b12c18c89 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/start/start.S
+++ b/c/src/lib/libbsp/powerpc/virtex5/start/start.S
@@ -376,7 +376,7 @@ startupBL:
         * PowerPC EABI.
         *
         * boot_card() supervises the initialization of RTEMS and the C
-        * library.  It calls bsp_start(), bsp_pretasking_hook(), etc.
+        * library.  It calls bsp_start(), bsp_predriver_hook(), etc.
         *------------------------------------------------------------------*/
         lwz     r2,toc_pointer-base_addr(r1)        /* set r2 to toc */
         lwz     r1,stack_top-base_addr(r1)          /* set r1 to stack_top */
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
index 211e5b1257..9d610e48ca 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
@@ -123,9 +123,6 @@ static void _noopfun(void) {}
 void app_bsp_start(void)
 __attribute__(( weak, alias("_noopfun") ));
 
-void app_bsp_pretasking_hook(void)
-__attribute__(( weak, alias("_noopfun") ));
-
 void app_bsp_predriver_hook(void)
 __attribute__(( weak, alias("_noopfun") ));
 
@@ -256,20 +253,6 @@ void bsp_start(void)
 
 
 /*
- *  BSP pretasking hook.  Called just before drivers are initialized.
- *  Used to setup libc and install any BSP extensions.
- *
- *  Must not use libc (to do io) from here, since drivers are not yet
- *  initialized.
- */
-
-void bsp_pretasking_hook(void)
-{
-  app_bsp_pretasking_hook();
-}
-
-
-/*
  *  BSP predriver hook.  Called by boot_card() just before drivers are
  *  initialized.  Clear out any stale interrupts here.
  */