diff options
author | Wolfgang Denk <wd@denx.de> | 2007-10-13 22:57:43 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-10-13 22:57:43 +0200 |
commit | 8f05a661e952f0edfefb985a5be4ad3c721a897e (patch) | |
tree | 7f9eac58a81fe09f9d4922683407162577a4d994 /common | |
parent | 86cc433e1b06aae6dcda399219009f2a2497a385 (diff) | |
parent | 853643d8cf2ca80cb2e25c53ad5dc580abafe166 (diff) | |
download | u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.zip u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.tar.gz u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.tar.bz2 |
Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'common')
-rw-r--r-- | common/cmd_mfsl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index 8d4c1a3..9d1d875 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -355,19 +355,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,6 +381,7 @@ 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); @@ -408,10 +408,10 @@ 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"); + " 1 - MSR - Machine status register\n" + " 3 - EAR - Exception address register\n" + " 5 - ESR - Exception status register\n"); #endif |