diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-27 00:03:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-27 20:46:31 +0100 |
| commit | a747a7f31059b9069e97c78bba5496409c33aa05 (patch) | |
| tree | fbb86723c7f45116d198a7c6e4d4f47e95dce896 /tools/envcrc.c | |
| parent | f3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff) | |
| download | olio-uboot-2014.01-a747a7f31059b9069e97c78bba5496409c33aa05.tar.xz olio-uboot-2014.01-a747a7f31059b9069e97c78bba5496409c33aa05.zip | |
Revert "env: only build env_embedded and envcrc when needed"
Breaks building on many boards, and no really clean fix available yet.
This reverts commit 6dab6add2d8ee80905234b326abc3de11be1d178.
Diffstat (limited to 'tools/envcrc.c')
| -rw-r--r-- | tools/envcrc.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c index d1e84b3b6..c8c50d719 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -51,6 +51,10 @@ # if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) # define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE # endif +# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ + ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) +# define ENV_IS_EMBEDDED 1 +# endif # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) # define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1 # endif @@ -67,11 +71,14 @@ extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int); +#ifdef ENV_IS_EMBEDDED extern unsigned int env_size; extern unsigned char environment; +#endif /* ENV_IS_EMBEDDED */ int main (int argc, char **argv) { +#ifdef ENV_IS_EMBEDDED unsigned char pad = 0x00; uint32_t crc; unsigned char *envptr = &environment, @@ -126,6 +133,8 @@ int main (int argc, char **argv) } else { printf ("0x%08X\n", crc); } - +#else + printf ("0\n"); +#endif return EXIT_SUCCESS; } |