From patchwork Fri Jul 8 20:44:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 103940 X-Patchwork-Delegate: wd@denx.de 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 12E191007D1 for ; Sat, 9 Jul 2011 06:44:30 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 86B8828085; Fri, 8 Jul 2011 22:44:28 +0200 (CEST) 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 RnbCgzPVxFHk; Fri, 8 Jul 2011 22:44:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6EA4628086; Fri, 8 Jul 2011 22:44:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D11D828086 for ; Fri, 8 Jul 2011 22:44:22 +0200 (CEST) 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 8HNB+f1MkACI for ; Fri, 8 Jul 2011 22:44:21 +0200 (CEST) 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 smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by theia.denx.de (Postfix) with ESMTPS id B948028085 for ; Fri, 8 Jul 2011 22:44:20 +0200 (CEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 32EC22AC103 for ; Fri, 8 Jul 2011 20:44:18 +0000 (UTC) From: Mike Frysinger To: u-boot@lists.denx.de Date: Fri, 8 Jul 2011 16:44:25 -0400 Message-Id: <1310157865-28441-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1303630430-29811-1-git-send-email-vapier@gentoo.org> References: <1303630430-29811-1-git-send-email-vapier@gentoo.org> Subject: [U-Boot] [PATCH v2] env: allow people to force envcrc building 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 For people who want to manually extract the embedded environment so that it can be manually packed into the final u-boot image, add a config opt to force building of the envcrc tool. Signed-off-by: Mike Frysinger --- v2 - updated to master after tools/ changes README | 5 +++++ common/env_embedded.c | 2 +- include/common.h | 5 +++++ tools/envcrc.c | 10 +++++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/README b/README index 446966d..ccefabb 100644 --- a/README +++ b/README @@ -2494,6 +2494,11 @@ The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: +- CONFIG_BUILD_ENVCRC: + + Builds up envcrc with the target environment so that external utils + may easily extract it and embed it in final U-Boot images. + - CONFIG_ENV_IS_IN_FLASH: Define this if the environment is in flash memory. diff --git a/common/env_embedded.c b/common/env_embedded.c index ae6cac4..e438575 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -44,7 +44,7 @@ * Generate embedded environment table * inside U-Boot image, if needed. */ -#if defined(ENV_IS_EMBEDDED) +#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_BUILD_ENVCRC) /* * Only put the environment in it's own section when we are building * U-Boot proper. The host based program "tools/envcrc" does not need diff --git a/include/common.h b/include/common.h index 1e21b7a..6b1a458 100644 --- a/include/common.h +++ b/include/common.h @@ -759,4 +759,9 @@ int cpu_release(int nr, int argc, char * const argv[]); #define ALIGN(x,a) __ALIGN_MASK((x),(typeof(x))(a)-1) #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) +/* Pull in stuff for the build system */ +#ifdef DO_DEPS_ONLY +# include +#endif + #endif /* __COMMON_H_ */ diff --git a/tools/envcrc.c b/tools/envcrc.c index c8c50d7..feebbab 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -60,6 +60,10 @@ # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ +#if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC) +# define CONFIG_BUILD_ENVCRC 1 +#endif + #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT # define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) #else @@ -71,14 +75,14 @@ extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int); -#ifdef ENV_IS_EMBEDDED +#ifdef CONFIG_BUILD_ENVCRC extern unsigned int env_size; extern unsigned char environment; -#endif /* ENV_IS_EMBEDDED */ +#endif /* CONFIG_BUILD_ENVCRC */ int main (int argc, char **argv) { -#ifdef ENV_IS_EMBEDDED +#ifdef CONFIG_BUILD_ENVCRC unsigned char pad = 0x00; uint32_t crc; unsigned char *envptr = &environment,