Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[u-boot] / board / iphase4539 / flash.c

diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c
index 401ffbe415f0a2fc102205d31a9b3034752b795e..098dcc2a4dd04904b21e57413af1823be5e63f02 100644 (file)
--- a/board/iphase4539/flash.c
+++ b/board/iphase4539/flash.c
@@ -71,15 +71,15 @@ unsigned long flash_init (void)
                /* monitor protection ON by default */
                flash_protect(FLAG_PROTECT_SET,
                              CFG_MONITOR_BASE,
-                             CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
+                             CFG_MONITOR_BASE + monitor_flash_len - 1,
                              flash_info + bank);
 #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,
-                             CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                             CONFIG_ENV_ADDR,
+                             CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
                              flash_info + bank);
 #endif