Merge commit 'remotes/wd/master' into newmaster

[oweals/u-boot.git] / cpu / mpc824x / cpu.c

diff --git a/cpu/mpc824x/cpu.c b/cpu/mpc824x/cpu.c
index 0d822d53b5bd702d9c8e6bb67764697fa7a55bff..0a45cc8419f610544969abd7600d85f033d09c8e 100644 (file)
--- a/cpu/mpc824x/cpu.c
+++ b/cpu/mpc824x/cpu.c
@@ -26,10 +26,10 @@
 #include <common.h>
 #include <command.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int checkcpu (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned int pvr = get_pvr ();
        unsigned int version = pvr >> 16;
        unsigned char revision;
@@ -92,8 +92,7 @@ int checkdcache (void)
 
 /*------------------------------------------------------------------- */
 
-int do_reset (cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc,
-                         char *argv[])
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        ulong msr, addr;
 
@@ -114,11 +113,11 @@ int do_reset (cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc,
        addr = CFG_RESET_ADDRESS;
 #else
        /*
-         * note: when CFG_MONITOR_BASE points to a RAM address,
-         * CFG_MONITOR_BASE - sizeof (ulong) is usually a valid
-         * address. Better pick an address known to be invalid on
-         * your system and assign it to CFG_RESET_ADDRESS.
-         * "(ulong)-1" used to be a good choice for many systems...
+        * note: when CFG_MONITOR_BASE points to a RAM address,
+        * CFG_MONITOR_BASE - sizeof (ulong) is usually a valid
+        * address. Better pick an address known to be invalid on
+        * your system and assign it to CFG_RESET_ADDRESS.
+        * "(ulong)-1" used to be a good choice for many systems...
         */
        addr = CFG_MONITOR_BASE - sizeof (ulong);
 #endif