summaryrefslogtreecommitdiff
path: root/board/fads
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 /board/fads
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 'board/fads')
-rw-r--r--board/fads/fads.h2
-rw-r--r--board/fads/flash.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 0a8b983..63b1e62 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -226,7 +226,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */
#define CFG_ENV_OFFSET CFG_ENV_SECT_SIZE
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */
diff --git a/board/fads/flash.c b/board/fads/flash.c
index 7cda3a4..742a889 100644
--- a/board/fads/flash.c
+++ b/board/fads/flash.c
@@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
-#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
@@ -124,7 +124,7 @@ unsigned long flash_init (void)
&flash_info[i]);
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
if (CFG_ENV_ADDR >= flash_info[i].start[0])
flash_protect (FLAG_PROTECT_SET,