rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 18f5533..4bc4afb 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -189,7 +189,7 @@
 #define CFG_MAX_FLASH_BANKS    2       /* max num of flash banks */
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE,  \
                                CFG_FLASH_BASE+0x04000000 } /* two banks */
@@ -197,24 +197,24 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x8000000 - 0x40000)
-#define CFG_ENV_SIZE           0x4000                       /* 16K */
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + 0x20000)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x8000000 - 0x40000)
+#define CONFIG_ENV_SIZE                0x4000                       /* 16K */
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + 0x20000)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #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
 
 /*