Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/README b/README
index 8e1a9ff..755d17c 100644
--- a/README
+++ b/README
@@ -675,7 +675,7 @@
(requires CONFIG_CMD_I2C)
CONFIG_CMD_SETGETDCR Support for DCR Register access
(4xx only)
- CONFIG_CMD_SHA1 print sha1 memory digest
+ CONFIG_CMD_SHA1SUM print sha1 memory digest
(requires CONFIG_CMD_MEMORY)
CONFIG_CMD_SOURCE "source" command Support
CONFIG_CMD_SPI * SPI serial bus support
diff --git a/boards.cfg b/boards.cfg
index 054bfc7..eceacf6 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -747,7 +747,7 @@
sh7763rdp sh sh4 sh7763rdp renesas -
sh7785lcr sh sh4 sh7785lcr renesas -
sh7785lcr_32bit sh sh4 sh7785lcr renesas - sh7785lcr:SH_32BIT=1
-MigoRsh sh4 MigoR renesas -
+MigoR sh sh4 MigoR renesas -
grsim_leon2 sparc leon2 - gaisler
gr_cpci_ax2000 sparc leon3 - gaisler
gr_ep2s60 sparc leon3 - gaisler
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index f03233c..ccf420a 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -1184,7 +1184,7 @@
}
#endif
-#ifdef CONFIG_CMD_SHA1
+#ifdef CONFIG_CMD_SHA1SUM
int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
unsigned long addr, len;
@@ -1343,7 +1343,7 @@
"compute SHA1 message digest",
"address count"
);
-#endif /* CONFIG_CMD_SHA1 */
+#endif /* CONFIG_CMD_SHA1SUM */
#ifdef CONFIG_CMD_UNZIP
U_BOOT_CMD(