summaryrefslogtreecommitdiff
path: root/board/ppmc7xx/flash.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
commit225f0eaa745adfae05931848543d99942798756a (patch)
treef5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /board/ppmc7xx/flash.c
parent6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff)
parentafbc526336447a7357e9c82852df0377d09a8089 (diff)
downloadu-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/ppmc7xx/flash.c')
-rw-r--r--board/ppmc7xx/flash.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/ppmc7xx/flash.c b/board/ppmc7xx/flash.c
index 4be6f13..1722a35 100644
--- a/board/ppmc7xx/flash.c
+++ b/board/ppmc7xx/flash.c
@@ -197,13 +197,13 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
-# ifndef CFG_ENV_SIZE
-# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef CONFIG_ENV_SIZE
+# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
- CFG_ENV_ADDR,
- CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+ CONFIG_ENV_ADDR,
+ CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);