rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / Yukon8220.h

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 1b4195a08fd0e2bb90f5c13308c75973d84ab44f..ef230e15dfa875c89911ba78ac17a03d7f5e6c57 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -133,7 +133,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS     3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM        1
 #define CFG_ENV_OFFSET         0
 #define CFG_ENV_SIZE           256
 */
@@ -205,7 +205,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if defined (CFG_AMD_BOOT)
 #define CFG_ENV_ADDR           (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
 #define CFG_ENV_SIZE           PHYS_AMD_SECT_SIZE
@@ -224,15 +224,15 @@
 
 #define CONFIG_ENV_OVERWRITE   1
 
-#if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#if defined CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
 #endif
 
 #ifndef CFG_JFFS2_FIRST_SECTOR