2007-03-28 Joel Sherrill <joel@OARcorp.com>

	PR 1233/bsps
	* Makefile.am, console/console.c, console/debugputs.c: Move printk
	support code into debug IO file so you do not get the entire console
	driver when you do not want it.

4 files changed, 31 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index 44b7809912..97c9a50c79 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-28	Joel Sherrill <joel@OARcorp.com>
+
+	PR 1233/bsps
+	* Makefile.am, console/console.c, console/debugputs.c: Move printk
+	support code into debug IO file so you do not get the entire console
+	driver when you do not want it.
+
 2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: New BUG-REPORT address.
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index e698e3d16c..a7b0c71217 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -43,11 +43,15 @@ gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
 gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console.c console/consolereserveresources.c \
-    console/debugputs.c
+console_rel_SOURCES = console/console.c console/consolereserveresources.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+noinst_PROGRAMS += debugio.rel
+debugio_rel_SOURCES = console/debugputs.c
+debugio_rel_CPPFLAGS = $(AM_CPPFLAGS)
+debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/ckinit.c
 clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -68,11 +72,16 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel gnatsupp.rel
+libbsp_a_LIBADD = console.rel debugio.rel clock.rel timer.rel gnatsupp.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += erc32sonic.rel
 endif
 
+libbsp_a_LIBADD += startup_rel-boardinit.o startup_rel-bootcard.o \
+    startup_rel-bspclean.o startup_rel-bsplibc.o startup_rel-bsppost.o \
+    startup_rel-bspstart.o startup_rel-erc32mec.o startup_rel-main.o \
+    startup_rel-sbrk.o startup_rel-setvec.o startup_rel-spurious.o
+
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
     ../../../libcpu/@RTEMS_CPU@/syscall.rel
diff --git a/c/src/lib/libbsp/sparc/erc32/console/console.c b/c/src/lib/libbsp/sparc/erc32/console/console.c
index 68d946672a..c7ec8a366a 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/console.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/console.c
@@ -416,14 +416,3 @@ rtems_device_driver console_control(
 {
   return rtems_termios_ioctl (arg);
 }
-
-/*
- *  To support printk
- */
-
-#include <rtems/bspIo.h>
-
-void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
-
-BSP_output_char_function_type           BSP_output_char = BSP_output_char_f;
-BSP_polling_getchar_function_type       BSP_poll_char = NULL;
diff --git a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
index 9332e9f957..5f4a5a8f76 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/debugputs.c
@@ -16,7 +16,6 @@
 #include <bsp.h>
 #include <rtems/libio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 /*
  *  console_outbyte_polled
@@ -74,7 +73,7 @@ int console_inbyte_nonblocking( int port )
       return (int) ERC32_MEC.UART_Channel_B;
 
     default:
-      assert( 0 );
+      rtems_fatal_error_occurred( 'D' << 8 | (port & 0xffffff) );
   }
 
   return -1;
@@ -110,3 +109,14 @@ void DEBUG_puts(
     console_outbyte_polled( 0, '\n' );
   ERC32_Restore_interrupt( ERC32_INTERRUPT_UART_A_RX_TX, old_level );
 }
+
+/*
+ *  To support printk
+ */
+
+#include <rtems/bspIo.h>
+
+void BSP_output_char_f(char c) { console_outbyte_polled( 0, c ); }
+
+BSP_output_char_function_type           BSP_output_char = BSP_output_char_f;
+BSP_polling_getchar_function_type       BSP_poll_char = NULL;