]> git.sur5r.net Git - u-boot/commitdiff
tools/envcrc: fix compile breakage
authorIgor Grinberg <grinberg@compulab.co.il>
Sun, 27 Nov 2011 21:57:38 +0000 (21:57 +0000)
committerWolfgang Denk <wd@denx.de>
Tue, 6 Dec 2011 21:11:25 +0000 (22:11 +0100)
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>
tools/envcrc.c

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