aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-27 00:03:32 +0100
committerWolfgang Denk <wd@denx.de>2009-10-27 20:46:31 +0100
commita747a7f31059b9069e97c78bba5496409c33aa05 (patch)
treefbb86723c7f45116d198a7c6e4d4f47e95dce896 /tools
parentf3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff)
downloadu-boot-a747a7f31059b9069e97c78bba5496409c33aa05.zip
u-boot-a747a7f31059b9069e97c78bba5496409c33aa05.tar.gz
u-boot-a747a7f31059b9069e97c78bba5496409c33aa05.tar.bz2
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')
-rw-r--r--tools/Makefile9
-rw-r--r--tools/envcrc.c11
2 files changed, 17 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 2a9a9fd1..b04e3f3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -69,7 +69,13 @@ include $(TOPDIR)/config.mk
BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
-BIN_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_DATAFLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_ONENAND) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NAND) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_SPI_FLASH) += envcrc$(SFX)
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
@@ -89,7 +95,6 @@ OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
OBJ_FILES-y += default_image.o
OBJ_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc.o
-OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
OBJ_FILES-y += fit_image.o
OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
diff --git a/tools/envcrc.c b/tools/envcrc.c
index d1e84b3..c8c50d7 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;
}