rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 00f80e4..ad7f290 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -41,7 +41,9 @@
 #define PLLMR0_DEFAULT         PLLMR0_266_133_66 /* no PCI */
 #define PLLMR1_DEFAULT         PLLMR1_266_133_66 /* no PCI */
 
-#define CFG_ENV_IS_IN_EEPROM    1   /* use the EEPROM for environment vars */
+/* the environment is in the EEPROM by default */
+#define CONFIG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1
@@ -180,7 +182,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible  */
-#define        CFG_FLASH_CFI_DRIVER
+#define        CONFIG_FLASH_CFI_DRIVER
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
@@ -196,14 +198,17 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET         0x00050000 /* Offset of Environment Sector  */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+/* the environment is located before u-boot */
+#define CFG_ENV_ADDR           (TEXT_BASE - CFG_ENV_SECT_SIZE)
+
+/* Address and size of Redundant Environment Sector    */
+#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
+#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE           0x400           /* Size of Environment vars */
 #define CFG_ENV_OFFSET         0x00000000
 #define CFG_ENABLE_CRC_16      1       /* Intrinsyc formatting used crc16 */