2009-11-23 Joel Sherrill <joel.sherrill@OARcorp.com>

	* shared/bsppretaskinghook.c: New file.  Was really common.
	* shared/bspstart.c: Removed.  Was really leon2 specific.

3 files changed, 34 insertions, 68 deletions

diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog
index dee76a0f6c..e57075a9ab 100644
--- a/c/src/lib/libbsp/sparc/ChangeLog
+++ b/c/src/lib/libbsp/sparc/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-23	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* shared/bsppretaskinghook.c: New file.  Was really common.  
+	* shared/bspstart.c: Removed.  Was really leon2 specific.
+
+
 2009-10-10	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* shared/bspgetworkarea.c: Add debug prints of memory information.
diff --git a/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c b/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c
new file mode 100644
index 0000000000..1157807616
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/shared/bsppretaskinghook.c
@@ -0,0 +1,28 @@
+/*
+ *  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.com/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.
+ *
+ *  $Id$
+ */
+
+#include <bsp.h>
+#include <bsp/bootcard.h>
+
+void bsp_pretasking_hook(void)
+{
+  bsp_spurious_initialize();
+}
diff --git a/c/src/lib/libbsp/sparc/shared/bspstart.c b/c/src/lib/libbsp/sparc/shared/bspstart.c
deleted file mode 100644
index 75a0fa4474..0000000000
--- a/c/src/lib/libbsp/sparc/shared/bspstart.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  This set of routines are the BSP specific initialization
- *  support routines.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  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.com/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.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <rtems/bspIo.h>
-
-/*
- *  LEON2 Cache Snooping Support
- */
-#ifdef LEON2
-  /*
-   * Tells us if data cache snooping is available
-   */ 
-  int CPU_SPARC_HAS_SNOOPING;
-
-  /*
-   * set_snooping
-   * 
-   * Read the data cache configuration register to determine if
-   * bus snooping is available. This is needed for some drivers so
-   * that they can select the most efficient copy routines.  
-   */
-  static inline int set_snooping(void) 
-  {
-    unsigned int tmp = *(unsigned int *)0x80000014; /* Cache control register */
-    return ((tmp>>23) & 1); /* Data cache snooping enabled */
-  }
-#endif
-
-/*
- *  BSP pretasking hook.  Called just before drivers are initialized.
- *  Used to setup libc and install any BSP extensions.
- */
-void bsp_pretasking_hook(void)
-{
-  bsp_spurious_initialize();
-}
-
-/*
- *  bsp_start
- *
- *  This routine does the bulk of the system initialization.
- */
-void bsp_start( void )
-{
-  #ifdef LEON2
-    CPU_SPARC_HAS_SNOOPING = set_snooping();
-  #endif
-}