diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-20 21:26:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-04 23:48:55 +0200 |
| commit | 0e70aaa485384fda5f757d5a1bd106b359c06e9c (patch) | |
| tree | d9a439fdfa73306118237f5dee522fe3722bf41b /include/configs/shannon.h | |
| parent | 9add504f0d60bce62fdc6a2161e8ba326cf42ee9 (diff) | |
| download | blackbird-obmc-uboot-0e70aaa485384fda5f757d5a1bd106b359c06e9c.tar.gz blackbird-obmc-uboot-0e70aaa485384fda5f757d5a1bd106b359c06e9c.zip | |
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>
Diffstat (limited to 'include/configs/shannon.h')
| -rw-r--r-- | include/configs/shannon.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/shannon.h b/include/configs/shannon.h index 13cc5ff3b7..d848915d0e 100644 --- a/include/configs/shannon.h +++ b/include/configs/shannon.h @@ -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 /*----------------------------------------------------------------------- |
