Fix merge problems

[platform/kernel/u-boot.git] / common / cmd_mfsl.c

diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index 8d4c1a3..c2442ee 100644 (file)
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -29,8 +29,6 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
-
-#if defined(CONFIG_CMD_MFSL)
 #include <asm/asm.h>
 
 int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -185,7 +183,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                return 1;
        }
 
-       printf ("%01x: 0x%08lx - %s %s read\n", fslnum, num,
+       printf ("%01x: 0x%08x - %s %s read\n", fslnum, num,
                blocking < 2  ? "non blocking" : "blocking",
                ((blocking == 1) || (blocking == 3)) ? "control" : "data" );
        return 0;
@@ -343,7 +341,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                return 1;
        }
 
-       printf ("%01x: 0x%08lx - %s %s write\n", fslnum, num,
+       printf ("%01x: 0x%08x - %s %s write\n", fslnum, num,
                blocking < 2  ? "non blocking" : "blocking",
                ((blocking == 1) || (blocking == 3)) ? "control" : "data" );
        return 0;
@@ -355,19 +353,18 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        unsigned int reg = 0;
        unsigned int val = 0;
 
-       reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
-       val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
-       if (argc < 1) {
+       if (argc < 2) {
                printf ("Usage:\n%s\n", cmdtp->usage);
                return 1;
        }
+       reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
+       val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
        switch (reg) {
        case 0x1:
                if (argc > 2) {
                        MTS (val, rmsr);
                        NOP;
                        MFS (val, rmsr);
-
                } else {
                        MFS (val, rmsr);
                }
@@ -382,9 +379,10 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                puts ("ESR");
                break;
        default:
+               puts ("Unsupported register\n");
                return 1;
        }
-       printf (": 0x%08lx\n", val);
+       printf (": 0x%08x\n", val);
        return 0;
 }
 
@@ -408,10 +406,8 @@ U_BOOT_CMD (fwr, 4, 1, do_fwr,
                " 3 - blocking control write\n");
 
 U_BOOT_CMD (rspr, 3, 1, do_rspr,
-               "rmsr    - read/write special purpose register\n",
+               "rspr    - read/write special purpose register\n",
                "- reg_num [write value] read/write special purpose register\n"
-               " 0 - MSR - Machine status register\n"
-               " 1 - EAR - Exception address register\n"
-               " 2 - ESR - Exception status register\n");
-
-#endif
+               " 1 - MSR - Machine status register\n"
+               " 3 - EAR - Exception address register\n"
+               " 5 - ESR - Exception status register\n");