Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / board / amcc / taihu / flash.c

diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c
index 290259e73f9c0e91bf203167444cdcdb927ae06a..ae92bb25b331be444cd607c6a0c44b097fc49973 100644 (file)
--- a/board/amcc/taihu/flash.c
+++ b/board/amcc/taihu/flash.c
@@ -87,12 +87,12 @@ unsigned long flash_init(void)
                                    CFG_MONITOR_BASE,
                                    CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
                                    &flash_info[0]);
-#ifdef CFG_ENV_IS_IN_FLASH
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+#ifdef CONFIG_ENV_IS_IN_FLASH
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
                                    &flash_info[0]);
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
                                    &flash_info[0]);
 #endif
                /* Also protect sector containing initial power-up instruction */