From patchwork Tue Jan 18 08:48:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Holler X-Patchwork-Id: 79272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 645D0B712F for ; Tue, 18 Jan 2011 19:48:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DCEB028091; Tue, 18 Jan 2011 09:48:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sEx3wpirU6n2; Tue, 18 Jan 2011 09:48:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D4BFA2809A; Tue, 18 Jan 2011 09:48:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 14AA228091 for ; Tue, 18 Jan 2011 09:48:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9xozTPZ+caKb for ; Tue, 18 Jan 2011 09:48:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.ahsoftware.de (h1047321.serverkompetenz.net [85.214.67.163]) by theia.denx.de (Postfix) with ESMTPS id 09AE42805F for ; Tue, 18 Jan 2011 09:48:34 +0100 (CET) Received: by mail.ahsoftware.de (Postfix, from userid 65534) id D6050598069; Tue, 18 Jan 2011 09:48:33 +0100 (CET) Received: from eiche.ahsoftware (p57B205F8.dip0.t-ipconnect.de [87.178.5.248]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.ahsoftware.de (Postfix) with ESMTP id 8A43C598069; Tue, 18 Jan 2011 09:48:30 +0100 (CET) Received: from krabat.ahsoftware (krabat.ahsoftware [192.168.207.2]) by eiche.ahsoftware (Postfix) with ESMTP id 0AE4E3FC98; Tue, 18 Jan 2011 09:48:28 +0100 (CET) From: Alexander Holler To: u-boot@lists.denx.de Date: Tue, 18 Jan 2011 09:48:08 +0100 Message-Id: <1295340488-10494-1-git-send-email-holler@ahsoftware.de> X-Mailer: git-send-email 1.7.3.4 Subject: [U-Boot] [PATCH] Fix defines needed to enable command sha1sum X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- README | 2 +- common/cmd_mem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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(