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

	* Makefile.am, startup/bspstart.c:
	Use ../../sparc/shared/bsppretaskinghook.c.
	* console/console.c: Remove sis comment.

4 files changed, 7 insertions, 23 deletions

diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index 1af90966e7..ea727084e3 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-23	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, startup/bspstart.c:
+	Use ../../sparc/shared/bsppretaskinghook.c.
+	* console/console.c: Remove sis comment.
+
 2009-10-30	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* amba/amba.c: Re-add tmp.
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 29418b1ade..f99cb84195 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -39,6 +39,7 @@ libbsp_a_SOURCES =
 # startup
 libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bootcard.c startup/bspstart.c \
+    ../../sparc/shared/bsppretaskinghook.c \
     ../../sparc/shared/bspgetworkarea.c ../../shared/sbrk.c startup/setvec.c \
     startup/spurious.c startup/bspidle.S
 # gnatsupp
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/c/src/lib/libbsp/sparc/leon3/console/console.c
index f5a235d9f2..5a9084affd 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/console.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/console.c
@@ -28,17 +28,6 @@
  *  Should we use a polled or interrupt drived console?
  *  
  *  NOTE: This is defined in the custom/leon.cfg file.
- *
- *  WARNING:  In sis 1.6, it did not appear that the UART interrupts
- *            worked in a desirable fashion.  Immediately upon writing
- *            a character into the TX buffer, an interrupt was generated.
- *            This did not allow enough time for the program to put more
- *            characters in the buffer.  So every character resulted in
- *            "priming" the transmitter.   This effectively results in 
- *            in a polled console with a useless interrupt per character
- *            on output.  It is reasonable to assume that input does not
- *            share this problem although it was not investigated.
- *
  */
 
 /*
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
index 0f7a8ba977..f53c1f4abc 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
@@ -47,18 +47,6 @@ static inline int set_snooping(void)
 }
 
 /*
- *  bsp_pretasking_hook
- *
- *  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.