redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
utp
Wolfgang Denk 2010-06-20 21:26:20 +02:00
parent 9add504f0d
commit 0e70aaa485
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/env_flash.c
View File

@ -44,12 +44,6 @@ DECLARE_GLOBAL_DATA_PTR;
#error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
#endif
#ifdef CONFIG_INFERNO
# ifdef CONFIG_ENV_ADDR_REDUND
#error CONFIG_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO
# endif
#endif
char * env_name_spec = "Flash";
#ifdef ENV_IS_EMBEDDED
@ -294,13 +288,7 @@ int saveenv(void)
len = CONFIG_ENV_SIZE;
#endif /* CONFIG_ENV_SECT_SIZE */
#ifndef CONFIG_INFERNO
end_addr = flash_sect_addr + len - 1;
#else
/* this is the last sector, and the size is hardcoded here */
/* otherwise we will get stack problems on loading 128 KB environment */
end_addr = flash_sect_addr + 0x20000 - 1;
#endif
debug ("Protect off %08lX ... %08lX\n",
(ulong)flash_sect_addr, end_addr);

4
common/env_nand.c
View File

@ -49,10 +49,6 @@
#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
#endif
#ifdef CONFIG_INFERNO
#error CONFIG_INFERNO not supported yet
#endif
#ifndef CONFIG_ENV_RANGE
#define CONFIG_ENV_RANGE CONFIG_ENV_SIZE
#endif

7
include/configs/shannon.h
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
/*-----------------------------------------------------------------------