bsps/sparc: Use default bsp_pretasking_hook()

Move content to bsp_predriver_hook() functions of the BSPs.

Update #2408.

7 files changed, 9 insertions, 29 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 8dcdd32940..b00853afb1 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -32,7 +32,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c
 libbsp_a_SOURCES += ../../shared/bsplibc.c
 libbsp_a_SOURCES += startup/bsppredriver.c
 libbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
-libbsp_a_SOURCES += ../../sparc/shared/bsppretaskinghook.c
+libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c
 libbsp_a_SOURCES += ../../shared/bsppost.c
 libbsp_a_SOURCES += ../../shared/bspstart.c
 libbsp_a_SOURCES += ../../shared/bootcard.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
index 9cf73d9886..6c6ea1e634 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bsppredriver.c
@@ -21,6 +21,8 @@
  */
 void bsp_predriver_hook( void )
 {
+  bsp_spurious_initialize();
+
   /* Initialize shared interrupt handling, must be done after IRQ
    * controller has been found and initialized.
    */
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 66c491defc..7eada5999f 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -34,7 +34,7 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c
 libbsp_a_SOURCES += ../../shared/bsppost.c
 libbsp_a_SOURCES += startup/bsppredriver.c
 libbsp_a_SOURCES += startup/bspstart.c
-libbsp_a_SOURCES += ../../sparc/shared/bsppretaskinghook.c
+libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c
 libbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
 libbsp_a_SOURCES += ../../shared/bootcard.c
 libbsp_a_SOURCES += ../../shared/sbrk.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
index ad3694dfbd..2cdf4daf8a 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
+++ b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
@@ -85,6 +85,8 @@ void bsp_driver_level_hook( int level )
  */
 void bsp_predriver_hook( void )
 {
+  bsp_spurious_initialize();
+
   /* Initialize shared interrupt handling, must be done after IRQ
    * controller has been found and initialized.
    */
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 72a074b34e..d261f9988c 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -35,7 +35,7 @@ libbsp_a_SOURCES =
 libbsp_a_SOURCES += startup/bspclean.c
 libbsp_a_SOURCES += ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bootcard.c startup/bspstart.c \
-    ../../sparc/shared/bsppretaskinghook.c startup/bsppredriver.c \
+    ../../shared/bsppretaskinghook.c startup/bsppredriver.c \
     ../../sparc/shared/startup/bspgetworkarea.c ../../shared/sbrk.c \
     startup/setvec.c \
     startup/spurious.c startup/bspidle.S startup/bspdelay.c \
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c
index bdc1ab8a9e..498c97b0a3 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c
@@ -32,6 +32,8 @@ static void leon3_interrupt_common_init( void )
  */
 void bsp_predriver_hook( void )
 {
+  bsp_spurious_initialize();
+
 #ifndef RTEMS_DRVMGR_STARTUP
   leon3_interrupt_common_init();
 #endif
diff --git a/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c b/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c
deleted file mode 100644
index 4c079c3b31..0000000000
--- a/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This set of routines are the BSP specific initialization
- *  support routines.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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.org/license/LICENSE.
- *
- *  Ported to ERC32 implementation of the SPARC by On-Line Applications
- *  Research Corporation (OAR) under contract to the European Space
- *  Agency (ESA).
- *
- *  ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995.
- *  European Space Agency.
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-void bsp_pretasking_hook(void)
-{
-  bsp_spurious_initialize();
-}