2005-01-04 Joel Sherrill <joel@OARcorp.com>

	* ChangeLog, startup/bspstart.c, tod/todcfg.c: Remove warnings.

3 files changed, 15 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index 7bab8fac65..45dcdca6cf 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,4 +1,9 @@
+2005-01-04	Joel Sherrill <joel@OARcorp.com>
+
+	* ChangeLog, startup/bspstart.c, tod/todcfg.c: Remove warnings.
+
 2004-11-30	Greg Menke <gregory.menke@gsfc.nasa.gov>
+
 	PR 729/bsps
 	* bootloader/pci.c: Removed the r->size=0 and r->base=0
 	assignement which makes too-large regions conflict with onboard
@@ -6,12 +11,12 @@
 	from the setup code, leaving it disabled.
 
 2004-11-30	Greg Menke <gregory.menke@gsfc.nasa.gov>
+
         PR 728/bsps 
 	* bootloader/ppcboot.lds: Modified ppcboot.lds to include new
 	.data and .rodata sections being generated by gcc-3.3.3 and above,
 	the lack of which was causing the bootloader to crash.
 
-
 2004-09-27      Greg Menke <gregory.menke@gsfc.nasa.gov>
 
 	PR 606/bsps
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 24ecda103d..a28a2c4e35 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -247,7 +247,8 @@ void bsp_start( void )
 #if !defined(mpc8240) && !defined(mpc8245)
   unsigned l2cr;
 #endif
-  register unsigned char* intrStack;
+  register uint32_t  intrStack;
+  register uint32_t *intrStackPtr;
   unsigned char *work_space_start;
   ppc_cpu_id_t myCpu;
   ppc_cpu_revision_t myCpuRevision;
@@ -307,16 +308,17 @@ void bsp_start( void )
    * This could be done later (e.g in IRQ_INIT) but it helps to understand
    * some settings below...
    */
-  intrStack = ((unsigned char*) __rtems_end) +
-    INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
+  intrStack = ((uint32_t) __rtems_end) + 
+          INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
-  (uint32_t)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
+  intrStack &= ~(CPU_STACK_ALIGNMENT-1);
 
   /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
-  *((uint32_t*)intrStack) = 0;
+  intrStackPtr = (uint32_t*) intrStack;
+  *intrStackPtr = 0;
 
-  _write_SPRG1((unsigned int)intrStack);
+  _write_SPRG1(intrStack);
 
   /* signal them that we have fixed PR288 - eventually, this should go away */
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
diff --git a/c/src/lib/libbsp/powerpc/shared/tod/todcfg.c b/c/src/lib/libbsp/powerpc/shared/tod/todcfg.c
index 12d81a877c..2311ce544b 100644
--- a/c/src/lib/libbsp/powerpc/shared/tod/todcfg.c
+++ b/c/src/lib/libbsp/powerpc/shared/tod/todcfg.c
@@ -65,5 +65,6 @@ unsigned32 mvmertc_get_register(
 )
 {
   printk( "RTC SUPPORT NOT IMPLEMENTED ON THIS BOARD\n");
+  return 0;
 }
 #endif