X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tools%2Fenvcrc.c;h=feebbabea0be822abe514340404a1fca9da9d468;hb=684cad5717ea5887a09f3c67732a17774a658b34;hp=c8c50d71962456e21724f68c733e2e863ff41fb9;hpb=a747a7f31059b9069e97c78bba5496409c33aa05;p=u-boot diff --git a/tools/envcrc.c b/tools/envcrc.c index c8c50d7196..feebbabea0 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,