2007-07-06 Joel Sherrill <joel.sherrill@oarcorp.com>

	* clock/clock.c, console/console.c: Add clock HW initialization missed
	in earlier conversion.

3 files changed, 19 insertions, 9 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index f517d67f77..d6f3ef1e20 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* clock/clock.c, console/console.c: Add clock HW initialization missed
+	in earlier conversion.
+
 2007-07-06	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* irq_init.c, Makefile.am: adapted to shared exception code
diff --git a/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c b/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
index 829f9c2f8d..2a638c0072 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
@@ -341,7 +341,10 @@ int BSP_connect_clock_handler (uint32_t gpt_no)
 /* This driver does this in clockOn called at connection time */
 #define Clock_driver_support_initialize_hardware() \
   do {        \
-    ;         \
+    counter_value = rtems_configuration_get_microseconds_per_tick() * \
+                    rtems_cpu_configuration_get_clicks_per_usec(); \
+    mpc5200_init_gpt(GPT); \
+    mpc5200_set_gpt_count(counter_value, GPT); \
   } while (0)
 
 #define Clock_driver_nanoseconds_since_last_tick \
diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
index e6ebb56bfb..e897d869fc 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -651,12 +651,17 @@ int mpc5200_uart_write(int minor, const char *buf, int len)
  *  Print functions prototyped in bspIo.h
  */
 static void A_BSP_output_char( char c )
-  {
+{
   char cr = '\r';
 
-
-  if(console_initialized == TRUE)
-    {
+  /*
+   *  If we are using U-Boot, then the console is already initialized
+   *  and we can just poll bytes out at any time.
+   */
+  #if !defined(HAS_UBOOT)
+    if (console_initialized == FALSE )
+     return
+  #endif
 
 #define PRINTK_WRITE mpc5200_uart_pollWrite
 
@@ -664,10 +669,7 @@ static void A_BSP_output_char( char c )
 
     if( c == '\n' )
       PRINTK_WRITE( PRINTK_MINOR, &cr, 1 );
-
-    }
-
-  }
+}
 
 /*
  ***************