summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
commit5a1aceb0689e2f731491838970884a673ef7e7d3 (patch)
treeecd34fd2a8454ff2fc1d67d81f193dd8313e77ef /tools
parent7d9b5bae5ba558c7464d89d033aca04acaf01172 (diff)
downloadu-boot-imx-5a1aceb0689e2f731491838970884a673ef7e7d3.zip
u-boot-imx-5a1aceb0689e2f731491838970884a673ef7e7d3.tar.gz
u-boot-imx-5a1aceb0689e2f731491838970884a673ef7e7d3.tar.bz2
rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/envcrc.c4
-rw-r--r--tools/updater/flash_hw.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c
index 550cf82..2f40051 100644
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -33,7 +33,7 @@
#include <config.h>
#undef __ASSEMBLY__
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@@ -56,7 +56,7 @@
# if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND)
# define CFG_REDUNDAND_ENVIRONMENT 1
# endif
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
#ifdef CFG_REDUNDAND_ENVIRONMENT
# define ENV_HEADER_SIZE (sizeof(uint32_t) + 1)
diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c
index 2d9b8c8..50b4df0 100644
--- a/tools/updater/flash_hw.c
+++ b/tools/updater/flash_hw.c
@@ -123,7 +123,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,