V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ENV Variable support for Flex-OneNAND 

Define and use CONFIG_ENV_ADDR_FLEX and CONFIG_ENV_SIZE_FLEX
for storing environment variables.

Signed-off-by: Rohit Hagargundgi <h.rohit@samsung.com>
Signed-off-by: Amul Kumar Saha <amul.saha@samsung.com>
This commit is contained in:
Amul Kumar Saha 2009-11-04 10:38:46 +05:30 committed by Scott Wood
parent cacbe91958
commit c758e947aa
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/env_onenand.c
View File

@ -60,11 +60,14 @@ uchar env_get_char_spec(int index)
void env_relocate_spec(void) void env_relocate_spec(void)
{ {
struct mtd_info *mtd = &onenand_mtd; struct mtd_info *mtd = &onenand_mtd;
struct onenand_chip *this = &onenand_chip;
loff_t env_addr; loff_t env_addr;
int use_default = 0; int use_default = 0;
size_t retlen; size_t retlen;
env_addr = CONFIG_ENV_ADDR; env_addr = CONFIG_ENV_ADDR;
if (FLEXONENAND(this))
env_addr = CONFIG_ENV_ADDR_FLEX;
/* Check OneNAND exist */ /* Check OneNAND exist */
if (mtd->writesize) if (mtd->writesize)
@ -91,6 +94,7 @@ void env_relocate_spec(void)
int saveenv(void) int saveenv(void)
{ {
struct mtd_info *mtd = &onenand_mtd; struct mtd_info *mtd = &onenand_mtd;
struct onenand_chip *this = &onenand_chip;
loff_t env_addr = CONFIG_ENV_ADDR; loff_t env_addr = CONFIG_ENV_ADDR;
struct erase_info instr = { struct erase_info instr = {
.callback = NULL, .callback = NULL,
@ -98,6 +102,12 @@ int saveenv(void)
size_t retlen; size_t retlen;
instr.len = CONFIG_ENV_SIZE; instr.len = CONFIG_ENV_SIZE;
if (FLEXONENAND(this)) {
env_addr = CONFIG_ENV_ADDR_FLEX;
instr.len = CONFIG_ENV_SIZE_FLEX;
instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ?
1 : 0;
}
instr.addr = env_addr; instr.addr = env_addr;
instr.mtd = mtd; instr.mtd = mtd;
if (mtd->erase(mtd, &instr)) { if (mtd->erase(mtd, &instr)) {

2
include/configs/apollon.h
View File

@ -76,6 +76,7 @@
* Size of malloc() pool * Size of malloc() pool
*/ */
#define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ #define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
#define CONFIG_ENV_SIZE_FLEX SZ_256K
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M)
/* bytes reserved for initial data */ /* bytes reserved for initial data */
#define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_GBL_DATA_SIZE 128
@ -255,6 +256,7 @@
#define CONFIG_SYS_MONITOR_LEN SZ_256K /* U-Boot image size */ #define CONFIG_SYS_MONITOR_LEN SZ_256K /* U-Boot image size */
#define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_IS_IN_ONENAND 1
#define CONFIG_ENV_ADDR 0x00020000 #define CONFIG_ENV_ADDR 0x00020000
#define CONFIG_ENV_ADDR_FLEX 0x00040000
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */