shannon/INFERNO: fix special handling of environment configuration

Remove some INFERNO related #ifdef's from common environment code by
fixing the board configuration settings (add CONFIG_ENV_SECT_SIZE).

While we are at it, fix comment which incorrectly talks about 4 KB
environment size, while it's actually 0x4000 = 16 KiB.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Rolf Offermanns <rof@sysgo.de>
This commit is contained in:
Wolfgang Denk
2010-06-20 21:26:20 +02:00
parent 9add504f0d
commit 0e70aaa485
3 changed files with 4 additions and 19 deletions

View File

@@ -161,12 +161,13 @@
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_INFERNO
/* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */
/* we take the last sector, 128 KB in size, but we only use 16 KB of it for stack reasons */
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE (128 << 10) /* size of environment sector */
#else
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment */
#endif
/*-----------------------------------------------------------------------