aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-07-08 10:44:25 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 16:33:49 +0200
commitc3eb3fe490daeb3746e5b1fe354ff1a19eb3e3a8 (patch)
tree8b7079a1f5d958f6806b952f92f8d1640bcff27b /tools
parent8875bdb34161f9fff13757161fa7d89846003d00 (diff)
downloadu-boot-linaro-stable-c3eb3fe490daeb3746e5b1fe354ff1a19eb3e3a8.tar.gz
env: allow people to force envcrc building
For people who want to manually extract the embedded environment so that it can be manually packed into the final u-boot image, add a config opt to force building of the envcrc tool. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/envcrc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c
index c8c50d719..feebbabea 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,