Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

[u-boot] / common / cmd_mfsl.c

diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index 3032489f08bd501153d806c329de8fb6699ab9a7..b19ad0e6381d61b607145f6daa15a81883760acf 100644 (file)
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -31,8 +31,6 @@
 #include <command.h>
 #include <asm/asm.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_MFSL)
-
 int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        unsigned int fslnum;
@@ -40,7 +38,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        unsigned int blocking;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -48,7 +46,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16);
        if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
                puts ("Bad number of FSL\n");
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -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;
@@ -198,7 +196,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        unsigned int blocking;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -206,7 +204,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        num = (unsigned int)simple_strtoul (argv[2], NULL, 16);
        blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16);
        if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
-               printf ("Bad number of FSL\nUsage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -343,52 +341,72 @@ 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;
 
 }
 
-int do_rmsr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
+       unsigned int reg = 0;
        unsigned int val = 0;
 
-       val = (unsigned int)simple_strtoul (argv[1], NULL, 16);
-       if (argc < 1) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+       if (argc < 2) {
+               cmd_usage(cmdtp);
                return 1;
        }
-       if (argc > 1) {
-               MTS (val);
-               MFS (val);
-       } else {
-               MFS (val);
+       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);
+               }
+               puts ("MSR");
+               break;
+       case 0x3:
+               MFS (val, rear);
+               puts ("EAR");
+               break;
+       case 0x5:
+               MFS (val, resr);
+               puts ("ESR");
+               break;
+       default:
+               puts ("Unsupported register\n");
+               return 1;
        }
-       printf ("rmsr: 0x%08lx\n", val);
+       printf (": 0x%08x\n", val);
        return 0;
 }
 
 /***************************************************/
 
 U_BOOT_CMD (frd, 3, 1, do_frd,
-               "frd     - read data from FSL\n",
+               "read data from FSL",
                "- [fslnum [0|1|2|3]]\n"
                " 0 - non blocking data read\n"
                " 1 - non blocking control read\n"
                " 2 - blocking data read\n"
-               " 3 - blocking control read\n");
-
+               " 3 - blocking control read");
 
 U_BOOT_CMD (fwr, 4, 1, do_fwr,
-               "fwr     - write data to FSL\n",
+               "write data to FSL",
                "- [fslnum [0|1|2|3]]\n"
                " 0 - non blocking data write\n"
                " 1 - non blocking control write\n"
                " 2 - blocking data write\n"
-               " 3 - blocking control write\n");
-
-U_BOOT_CMD (rmsr, 2, 1, do_rmsr,
-           "rmsr    - read MSR register\n", "- read MSR register.\n");
+               " 3 - blocking control write");
 
-#endif                         /* CONFIG_MICROBLAZE & CFG_CMD_MFSL */
+U_BOOT_CMD (rspr, 3, 1, do_rspr,
+               "read/write special purpose register",
+               "- reg_num [write value] read/write special purpose register\n"
+               " 1 - MSR - Machine status register\n"
+               " 3 - EAR - Exception address register\n"
+               " 5 - ESR - Exception status register");