V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tools/envcrc: fix compile breakage 

When ENV_IS_EMBEDDED is not set, but CONFIG_BUILD_ENVCRC is set,
the environment.h file does not get included resulting in unrecognized
env_t type.
Fix this by moving the include directive.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Igor Grinberg 2011-11-27 21:57:38 +00:00 committed by Wolfgang Denk
parent 734329f964
commit 73f94ed403
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/envcrc.c
View File

@ -61,7 +61,6 @@
#endif /* CONFIG_ENV_IS_IN_FLASH */ #endif /* CONFIG_ENV_IS_IN_FLASH */
#if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC) #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
# include <environment.h>
# define CONFIG_BUILD_ENVCRC 1 # define CONFIG_BUILD_ENVCRC 1
#endif #endif
@ -74,13 +73,14 @@
#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE) #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
#ifdef CONFIG_BUILD_ENVCRC #ifdef CONFIG_BUILD_ENVCRC
# include <environment.h>
extern unsigned int env_size; extern unsigned int env_size;
extern env_t environment; extern env_t environment;
#endif /* CONFIG_BUILD_ENVCRC */ #endif /* CONFIG_BUILD_ENVCRC */
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
#ifdef CONFIG_BUILD_ENVCRC #ifdef CONFIG_BUILD_ENVCRC