Patchwork [U-Boot] Fix defines needed to enable command sha1sum

login
register
mail settings
Submitter Alexander Holler
Date Jan. 18, 2011, 8:48 a.m.
Message ID <1295340488-10494-1-git-send-email-holler@ahsoftware.de>
Download mbox | patch
Permalink /patch/79272/
State Accepted
Headers show

Comments

Alexander Holler - Jan. 18, 2011, 8:48 a.m.
Documented is CONFIG_CMD_SHA1, through confusion in the source
CONFIG_CMD_SHA1 and CONFIG_CMD_SHA1SUM has to be used to enable
sha1sum.

Fix both, the documentation and the source, so that only
CONFIG_CMD_SHA1SUM is needed to enable the command sha1sum.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
---
 README           |    2 +-
 common/cmd_mem.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Wolfgang Denk - Jan. 19, 2011, 8:39 a.m.
Dear Alexander Holler,

In message <1295340488-10494-1-git-send-email-holler@ahsoftware.de> you wrote:
> Documented is CONFIG_CMD_SHA1, through confusion in the source
> CONFIG_CMD_SHA1 and CONFIG_CMD_SHA1SUM has to be used to enable
> sha1sum.
> 
> Fix both, the documentation and the source, so that only
> CONFIG_CMD_SHA1SUM is needed to enable the command sha1sum.
> 
> Signed-off-by: Alexander Holler <holler@ahsoftware.de>
> ---
>  README           |    2 +-
>  common/cmd_mem.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/README b/README
index 8e1a9ff..755d17c 100644
--- a/README
+++ b/README
@@ -675,7 +675,7 @@  The following options need to be configured:
 					  (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/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 @@  int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 #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 @@  U_BOOT_CMD(
 	"compute SHA1 message digest",
 	"address count"
 );
-#endif /* CONFIG_CMD_SHA1 */
+#endif /* CONFIG_CMD_SHA1SUM */
 
 #ifdef CONFIG_CMD_UNZIP
 U_BOOT_CMD(