PXA: Unify vpac270 environment size
authorMarek Vasut <marek.vasut@gmail.com>
Sun, 13 Nov 2011 00:40:46 +0000 (01:40 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 6 Dec 2011 22:59:32 +0000 (23:59 +0100)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
include/configs/vpac270.h

index 41f8a6b01602ce284a44ed0a67e94b2fec315806..e78b83ac88bcad8d7c31249fa7b37117a6a2af16 100644 (file)
 #define        CONFIG_SYS_MONITOR_LEN          0x80000
 #define        CONFIG_ENV_ADDR                 \
                        (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-#define        CONFIG_ENV_SIZE                 0x4000
+#define        CONFIG_ENV_SIZE                 0x20000
+#define        CONFIG_ENV_SECT_SIZE            0x20000
 
 #if    defined(CONFIG_CMD_FLASH)       /* NOR */
 #define        PHYS_FLASH_1                    0x00000000      /* Flash Bank #1 */
 
 #define        CONFIG_ENV_IS_IN_FLASH          1
 
-/*
- * The first four sectors of the NOR flash are 0x8000 bytes big, the rest of the
- * flash consists of 0x20000 bytes big sectors.
- */
-#if    (CONFIG_ENV_ADDR <= 0x18000)
-#define        CONFIG_ENV_SECT_SIZE            0x8000
-#else
-#define        CONFIG_ENV_SECT_SIZE            0x20000
-#endif
-
 #elif  defined(CONFIG_CMD_ONENAND)     /* OneNAND */
 #define        CONFIG_SYS_NO_FLASH
 #define        CONFIG_SYS_ONENAND_BASE         0x00000000
 
 #define        CONFIG_ENV_IS_IN_ONENAND        1
-#define        CONFIG_ENV_SECT_SIZE            0x20000
 
 #else  /* No flash */
 #define        CONFIG_SYS_NO_FLASH