| Message ID | 1310157865-28441-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted |
| Commit | c3eb3fe490daeb3746e5b1fe354ff1a19eb3e3a8 |
| Delegated to: | Wolfgang Denk |
| Headers | show |
Dear Mike Frysinger, In message <1310157865-28441-1-git-send-email-vapier@gentoo.org> you wrote: > 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 <vapier@gentoo.org> > --- > 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(-) Applied, thanks. Best regards, Wolfgang Denk
Dear Mike Frysinger, In message <1310157865-28441-1-git-send-email-vapier@gentoo.org> you wrote: > 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 <vapier@gentoo.org> > --- > 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(-) This commit causes build warnings for a number of boards, for example: -> ./MAKEALL acadia_nand In file included from include/common.h:766: /home/wd/git/u-boot/work/include/environment.h:127:1: warning: "CONFIG_ENV_IS_EMBEDDED" redefined In file included from /home/wd/git/u-boot/work/include/config.h:7, from include/common.h:37: /home/wd/git/u-boot/work/include/configs/acadia.h:106:1: warning: this is the location of the previous definition Configuring for acadia_nand - Board: acadia, Options: NAND_U_BOOT,SYS_TEXT_BASE=0x01000000 In file included from include/common.h:766: /home/wd/git/u-boot/work/include/environment.h:127:1: warning: "CONFIG_ENV_IS_EMBEDDED" redefined In file included from /home/wd/git/u-boot/work/include/config.h:7, from include/common.h:37: /home/wd/git/u-boot/work/include/configs/acadia.h:106:1: warning: this is the location of the previous definition In file included from /home/wd/git/u-boot/work/include/common.h:766, from lib/asm-offsets.c:18: /home/wd/git/u-boot/work/include/environment.h:127:1: warning: "CONFIG_ENV_IS_EMBEDDED" redefined In file included from /home/wd/git/u-boot/work/include/config.h:7, from /home/wd/git/u-boot/work/include/common.h:37, from lib/asm-offsets.c:18: /home/wd/git/u-boot/work/include/configs/acadia.h:106:1: warning: this is the location of the previous definition ... Please fix. Best regards, Wolfgang Denk
On Friday, July 29, 2011 04:57:53 Wolfgang Denk wrote: > Mike Frysinger wrote: > > 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. > > > > README | 5 +++++ > > common/env_embedded.c | 2 +- > > include/common.h | 5 +++++ > > tools/envcrc.c | 10 +++++++--- > > 4 files changed, 18 insertions(+), 4 deletions(-) > > This commit causes build warnings for a number of boards, for example: sorry, i had another patch locally that i missed squashing in that fixed this. but i see you've already taken care of it. -mike
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 <environment.h> +#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,
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 <vapier@gentoo.org> --- 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(-)