From: Marek Vasut Date: Sun, 13 Nov 2011 00:40:46 +0000 (+0100) Subject: PXA: Unify vpac270 environment size X-Git-Tag: v2011.12-rc1~60^2~89 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e43c749f2c9c22e0841294c304639907b444608;p=oweals%2Fu-boot.git PXA: Unify vpac270 environment size Signed-off-by: Marek Vasut Cc: Albert Aribaud --- diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 41f8a6b016..e78b83ac88 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -209,7 +209,8 @@ #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 */ @@ -238,22 +239,11 @@ #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