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

[platform/kernel/u-boot.git] / include / configs / MPC8260ADS.h

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 59d0bdb..763ad4c 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -380,13 +380,13 @@
 #endif /* CONFIG_BZIP2 */
 
 #ifndef CFG_RAMBOOT
-#  define CFG_ENV_IS_IN_FLASH  1
-#  define CFG_ENV_SECT_SIZE    0x40000
-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
+#  define CONFIG_ENV_IS_IN_FLASH       1
+#  define CONFIG_ENV_SECT_SIZE 0x40000
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
-#  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
-#  define CFG_ENV_SIZE         0x200
+#  define CONFIG_ENV_IS_IN_NVRAM       1
+#  define CONFIG_ENV_ADDR              (CFG_MONITOR_BASE - 0x1000)
+#  define CONFIG_ENV_SIZE              0x200
 #endif /* CFG_RAMBOOT */
 
 #define CFG_CACHELINE_SIZE     32      /* For MPC8260 CPU */