Merge patch series "cmd: bdinfo: Optionally use getopt and implement bdinfo -a"

[J-u-boot.git] / cmd / fuse.c

diff --git a/cmd/fuse.c b/cmd/fuse.c
index e001619d17200de9884b40575526b7064b15fec7..0676bb7a812f7cf9afb6b8b4a88698b267394ed1 100644 (file)
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <console.h>
 #include <fuse.h>
+#include <mapmem.h>
 #include <linux/errno.h>
 
 static int strtou32(const char *str, unsigned int base, u32 *result)
@@ -45,7 +46,9 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc,
 {
        const char *op = argc >= 2 ? argv[1] : NULL;
        int confirmed = argc >= 3 && !strcmp(argv[2], "-y");
-       u32 bank, word, cnt, val;
+       u32 bank, word, cnt, val, cmp;
+       ulong addr;
+       void *buf, *start;
        int ret, i;
 
        argc -= 2 + confirmed;
@@ -73,6 +76,46 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc,
                        printf(" %.8x", val);
                }
                putc('\n');
+       } else if (!strcmp(op, "readm")) {
+               if (argc == 3)
+                       cnt = 1;
+               else if (argc != 4 || strtou32(argv[3], 0, &cnt))
+                       return CMD_RET_USAGE;
+
+               addr = simple_strtoul(argv[2], NULL, 16);
+
+               start = map_sysmem(addr, 4);
+               buf = start;
+
+               printf("Reading bank %u len %u to 0x%lx\n", bank, cnt, addr);
+               for (i = 0; i < cnt; i++, word++) {
+                       ret = fuse_read(bank, word, &val);
+                       if (ret)
+                               goto err;
+
+                       *((u32 *)buf) = val;
+                       buf += 4;
+               }
+
+               unmap_sysmem(start);
+       } else if (!strcmp(op, "cmp")) {
+               if (argc != 3 || strtou32(argv[2], 0, &cmp))
+                       return CMD_RET_USAGE;
+
+               printf("Comparing bank %u:\n", bank);
+               printf("\nWord 0x%.8x:", word);
+               printf("\nValue 0x%.8x:", cmp);
+
+               ret = fuse_read(bank, word, &val);
+               if (ret)
+                       goto err;
+
+               printf("0x%.8x\n", val);
+               if (val != cmp) {
+                       printf("failed\n");
+                       return CMD_RET_FAILURE;
+               }
+               printf("passed\n");
        } else if (!strcmp(op, "sense")) {
                if (argc == 2)
                        cnt = 1;
@@ -137,6 +180,10 @@ U_BOOT_CMD(
        "Fuse sub-system",
             "read <bank> <word> [<cnt>] - read 1 or 'cnt' fuse words,\n"
        "    starting at 'word'\n"
+       "fuse cmp <bank> <word> <hexval> - compare 'hexval' to fuse\n"
+       "    at 'word'\n"
+       "fuse readm <bank> <word> <addr> [<cnt>] - read 1 or 'cnt' fuse words,\n"
+       "    starting at 'word' into memory at 'addr'\n"
        "fuse sense <bank> <word> [<cnt>] - sense 1 or 'cnt' fuse words,\n"
        "    starting at 'word'\n"
        "fuse prog [-y] <bank> <word> <hexval> [<hexval>...] - program 1 or\n"