karo: tx6: rename CONFIG_SYS_BOOT_CMD_NAND to FDTSAVE_CMD_STR

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

diff --git a/common/cmd_md5sum.c b/common/cmd_md5sum.c
index fbe0aba84159bc14702087b9034e6624677689f1..23bb81e88cbf02ca73224b244e1c2359cd9c9f2a 100644 (file)
--- a/common/cmd_md5sum.c
+++ b/common/cmd_md5sum.c
@@ -5,28 +5,39 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <mapmem.h>
 #include <u-boot/md5.h>
+#include <asm/io.h>
+
+/*
+ * Store the resulting sum to an address or variable
+ */
+static void store_result(const u8 *sum, const char *dest)
+{
+       unsigned int i;
+
+       if (*dest == '*') {
+               u8 *ptr;
+
+               ptr = (u8 *)simple_strtoul(dest + 1, NULL, 16);
+               for (i = 0; i < 16; i++)
+                       *ptr++ = sum[i];
+       } else {
+               char str_output[33];
+               char *str_ptr = str_output;
+
+               for (i = 0; i < 16; i++) {
+                       sprintf(str_ptr, "%02x", sum[i]);
+                       str_ptr += 2;
+               }
+               setenv(dest, str_output);
+       }
+}
 
 #ifdef CONFIG_MD5SUM_VERIFY
 static int parse_verify_sum(char *verify_str, u8 *vsum)
@@ -70,6 +81,7 @@ int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        int verify = 0;
        int ac;
        char * const *av;
+       void *buf;
 
        if (argc < 3)
                return CMD_RET_USAGE;
@@ -87,13 +99,18 @@ int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        addr = simple_strtoul(*av++, NULL, 16);
        len = simple_strtoul(*av++, NULL, 16);
 
-       md5_wd((unsigned char *) addr, len, output, CHUNKSZ_MD5);
+       buf = map_sysmem(addr, len);
+       md5_wd(buf, len, output, CHUNKSZ_MD5);
+       unmap_sysmem(buf);
 
        if (!verify) {
                printf("md5 for %08lx ... %08lx ==> ", addr, addr + len - 1);
                for (i = 0; i < 16; i++)
                        printf("%02x", output[i]);
                printf("\n");
+
+               if (ac > 2)
+                       store_result(output, *av);
        } else {
                char *verify_str = *av++;
 
@@ -123,6 +140,7 @@ static int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        unsigned long addr, len;
        unsigned int i;
        u8 output[16];
+       void *buf;
 
        if (argc < 3)
                return CMD_RET_USAGE;
@@ -130,12 +148,18 @@ static int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        addr = simple_strtoul(argv[1], NULL, 16);
        len = simple_strtoul(argv[2], NULL, 16);
 
-       md5_wd((unsigned char *) addr, len, output, CHUNKSZ_MD5);
+       buf = map_sysmem(addr, len);
+       md5_wd(buf, len, output, CHUNKSZ_MD5);
+       unmap_sysmem(buf);
+
        printf("md5 for %08lx ... %08lx ==> ", addr, addr + len - 1);
        for (i = 0; i < 16; i++)
                printf("%02x", output[i]);
        printf("\n");
 
+       if (argc > 3)
+               store_result(output, argv[3]);
+
        return 0;
 }
 #endif
@@ -144,15 +168,16 @@ static int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
        md5sum, 5,      1,      do_md5sum,
        "compute MD5 message digest",
-       "address count\n"
-               "    - compute MD5 message digest\n"
+       "address count [[*]sum]\n"
+               "    - compute MD5 message digest [save to sum]\n"
        "md5sum -v address count [*]sum\n"
                "    - verify md5sum of memory area"
 );
 #else
 U_BOOT_CMD(
-       md5sum, 3,      1,      do_md5sum,
+       md5sum, 4,      1,      do_md5sum,
        "compute MD5 message digest",
-       "address count"
+       "address count [[*]sum]\n"
+               "    - compute MD5 message digest [save to sum]"
 );
 #endif