integrator: enable device tree

[karo-tx-uboot.git] / common / cmd_sha1sum.c

diff --git a/common/cmd_sha1sum.c b/common/cmd_sha1sum.c
index bb3cff01f0cca72c91d16cdc2b4841e6fd6bfb65..9f08629b8784e3bd4e14f3f528d091917b75891c 100644 (file)
--- a/common/cmd_sha1sum.c
+++ b/common/cmd_sha1sum.c
@@ -1,4 +1,7 @@
 /*
+ * (C) Copyright 2011
+ * Joe Hershberger, National Instruments, joe.hershberger@ni.com
+ *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
@@ -23,31 +26,45 @@
 
 #include <common.h>
 #include <command.h>
+#include <hash.h>
 #include <sha1.h>
 
-static int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       unsigned long addr, len;
-       unsigned int i;
-       u8 output[20];
+       int flags = HASH_FLAG_ENV;
+       int ac;
+       char * const *av;
 
        if (argc < 3)
-               return cmd_usage(cmdtp);
-
-       addr = simple_strtoul(argv[1], NULL, 16);
-       len = simple_strtoul(argv[2], NULL, 16);
+               return CMD_RET_USAGE;
 
-       sha1_csum((unsigned char *) addr, len, output);
-       printf("SHA1 for %08lx ... %08lx ==> ", addr, addr + len - 1);
-       for (i = 0; i < 20; i++)
-               printf("%02x", output[i]);
-       printf("\n");
+       av = argv + 1;
+       ac = argc - 1;
+#ifdef CONFIG_SHA1SUM_VERIFY
+       if (strcmp(*av, "-v") == 0) {
+               flags |= HASH_FLAG_VERIFY;
+               av++;
+               ac--;
+       }
+#endif
 
-       return 0;
+       return hash_command("sha1", flags, cmdtp, flag, ac, av);
 }
 
+#ifdef CONFIG_SHA1SUM_VERIFY
+U_BOOT_CMD(
+       sha1sum,        5,      1,      do_sha1sum,
+       "compute SHA1 message digest",
+       "address count [[*]sum]\n"
+               "    - compute SHA1 message digest [save to sum]\n"
+       "sha1sum -v address count [*]sum\n"
+               "    - verify sha1sum of memory area"
+);
+#else
 U_BOOT_CMD(
-       sha1sum,        3,      1,      do_sha1sum,
+       sha1sum,        4,      1,      do_sha1sum,
        "compute SHA1 message digest",
-       "address count"
+       "address count [[*]sum]\n"
+               "    - compute SHA1 message digest [save to sum]"
 );
+#endif