Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / zeus / zeus.c

diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 2a4ec5ca78b8181a82d2ef8a0593944d9ac09c98..6fa4eef8b3c1d3fa79cc064851e84204a9d6e5ce 100644 (file)
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -150,8 +150,8 @@ int misc_init_r(void)
 
        /* Env protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,
-                           CFG_ENV_ADDR_REDUND,
-                           CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                           CONFIG_ENV_ADDR_REDUND,
+                           CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
                            &flash_info[0]);
 
        return 0;
@@ -226,12 +226,12 @@ static int restore_default(void)
         * Unprotect and erase environment area
         */
        flash_protect(FLAG_PROTECT_CLEAR,
-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
                      &flash_info[0]);
 
-       flash_sect_erase(CFG_ENV_ADDR_REDUND,
-                        CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1);
+       flash_sect_erase(CONFIG_ENV_ADDR_REDUND,
+                        CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1);
 
        /*
         * Now restore default environment from U-Boot image