From: Detlev Zundel <dzu@denx.de>
Date: Fri, 22 Jan 2010 13:47:59 +0000 (+0100)
Subject: mpc512x: Add display of reset status register
X-Git-Tag: v2010.03-rc1~117
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82826d5422331e9c99e5408dcf0348c8e0c257a6;p=pandora-u-boot.git

mpc512x: Add display of reset status register

Content of the RSR is put into gd early so we can output it together
with the CPU info.  The clearing of gd in board_init_f is redundant for
this architecture as it is done in cpu_init_f so we remove it.

Signed-off-by: Detlev Zundel <dzu@denx.de>
---

diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index f96a4c8112..09cbd2024d 100644
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
@@ -66,9 +66,10 @@ int checkcpu (void)
 	default:
 		puts ("unknown ");
 	}
-	printf ("at %s MHz, CSB at %s MHz\n",
+	printf ("at %s MHz, CSB at %s MHz (RSR=0x%04lx)\n",
 		strmhz(buf1, clock),
-		strmhz(buf2, gd->csb_clk) );
+		strmhz(buf2, gd->csb_clk),
+		gd->reset_status & 0xffff);
 	return 0;
 }
 
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index dd22f99c67..2889b2c2c5 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2006
+ * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -378,8 +378,9 @@ void board_init_f (ulong bootflag)
 	/* compiler optimization barrier needed for GCC >= 3.4 */
 	__asm__ __volatile__("": : :"memory");
 
-#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83xx) && \
-    !defined(CONFIG_MPC85xx) && !defined(CONFIG_MPC86xx)
+#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC512X) && \
+    !defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
+    !defined(CONFIG_MPC86xx)
 	/* Clear initial global data */
 	memset ((void *) gd, 0, sizeof (gd_t));
 #endif