GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MTD: OneNAND: Increase the environment size to 4KiB

Browse source 
Also use mtd operation instead of onenand functions

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Kyungmin Park 2009-07-11 16:49:55 +09:00 • committed by Scott Wood
parent bfadb17f69
commit 937076f84c
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
common/env_onenand.c
View file

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2005-2007 Samsung Electronics * (C) Copyright 2005-2009 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -37,15 +37,16 @@ extern struct onenand_chip onenand_chip;
/* References to names in env_common.c */ /* References to names in env_common.c */
extern uchar default_environment[]; extern uchar default_environment[];
#define ONENAND_ENV_SIZE(mtd) (mtd.writesize - ENV_HEADER_SIZE)
char *env_name_spec = "OneNAND"; char *env_name_spec = "OneNAND";
#define ONENAND_MAX_ENV_SIZE 4096
#define ONENAND_ENV_SIZE(mtd) (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
extern uchar environment[]; extern uchar environment[];
env_t *env_ptr = (env_t *) (&environment[0]); env_t *env_ptr = (env_t *) (&environment[0]);
#else /* ! ENV_IS_EMBEDDED */ #else /* ! ENV_IS_EMBEDDED */
static unsigned char onenand_env[MAX_ONENAND_PAGESIZE]; static unsigned char onenand_env[ONENAND_MAX_ENV_SIZE];
env_t *env_ptr = (env_t *) onenand_env; env_t *env_ptr = (env_t *) onenand_env;
#endif /* ENV_IS_EMBEDDED */ #endif /* ENV_IS_EMBEDDED */
@ -58,6 +59,7 @@ uchar env_get_char_spec(int index)
void env_relocate_spec(void) void env_relocate_spec(void)
{ {
struct mtd_info *mtd = &onenand_mtd;
loff_t env_addr; loff_t env_addr;
int use_default = 0; int use_default = 0;
size_t retlen; size_t retlen;
@ -65,22 +67,21 @@ void env_relocate_spec(void)
env_addr = CONFIG_ENV_ADDR; env_addr = CONFIG_ENV_ADDR;
/* Check OneNAND exist */ /* Check OneNAND exist */
if (onenand_mtd.writesize) if (mtd->writesize)
/* Ignore read fail */ /* Ignore read fail */
onenand_read(&onenand_mtd, env_addr, onenand_mtd.writesize, mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
&retlen, (u_char *) env_ptr); &retlen, (u_char *) env_ptr);
else else
onenand_mtd.writesize = MAX_ONENAND_PAGESIZE; mtd->writesize = MAX_ONENAND_PAGESIZE;
if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) != if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd)) != env_ptr->crc)
env_ptr->crc)
use_default = 1; use_default = 1;
if (use_default) { if (use_default) {
memcpy(env_ptr->data, default_environment, memcpy(env_ptr->data, default_environment,
ONENAND_ENV_SIZE(onenand_mtd)); ONENAND_ENV_SIZE(mtd));
env_ptr->crc = env_ptr->crc =
crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)); crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd));
} }
gd->env_addr = (ulong) & env_ptr->data; gd->env_addr = (ulong) & env_ptr->data;
@ -89,7 +90,8 @@ void env_relocate_spec(void)
int saveenv(void) int saveenv(void)
{ {
unsigned long env_addr = CONFIG_ENV_ADDR; struct mtd_info *mtd = &onenand_mtd;
loff_t env_addr = CONFIG_ENV_ADDR;
struct erase_info instr = { struct erase_info instr = {
.callback = NULL, .callback = NULL,
}; };
@ -97,17 +99,16 @@ int saveenv(void)
instr.len = CONFIG_ENV_SIZE; instr.len = CONFIG_ENV_SIZE;
instr.addr = env_addr; instr.addr = env_addr;
instr.mtd = &onenand_mtd; instr.mtd = mtd;
if (onenand_erase(&onenand_mtd, &instr)) { if (mtd->erase(mtd, &instr)) {
printf("OneNAND: erase failed at 0x%08lx\n", env_addr); printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
return 1; return 1;
} }
/* update crc */ /* update crc */
env_ptr->crc = env_ptr->crc = crc32(0, env_ptr->data, ONENAND_ENV_SIZE(mtd));
crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen, if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
(u_char *) env_ptr)) { (u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%llx\n", instr.addr); printf("OneNAND: write failed at 0x%llx\n", instr.addr);
return 2; return 2;