From: Igor Grinberg Date: Sun, 27 Nov 2011 21:57:38 +0000 (+0000) Subject: tools/envcrc: fix compile breakage X-Git-Tag: v2011.12-rc1~71 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73f94ed403a24496d30d4a65afcf2a2d1c0c58d1;p=u-boot 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 Signed-off-by: Igor Grinberg Tested-by: Mike Frysinger --- diff --git a/tools/envcrc.c b/tools/envcrc.c index 111d9f6289..51e3f54a38 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -61,7 +61,6 @@ #endif /* CONFIG_ENV_IS_IN_FLASH */ #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC) -# include # define CONFIG_BUILD_ENVCRC 1 #endif @@ -74,13 +73,14 @@ #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 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