projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
common
/
env_onenand.c
diff --git
a/common/env_onenand.c
b/common/env_onenand.c
index
5888f75
..
d5c907c
100644
(file)
--- a/
common/env_onenand.c
+++ b/
common/env_onenand.c
@@
-40,7
+40,7
@@
extern struct onenand_chip onenand_chip;
/* References to names in env_common.c */
extern uchar default_environment[];
/* References to names in env_common.c */
extern uchar default_environment[];
-#define ONENAND_ENV_SIZE(mtd) (mtd.
oobblock
- ENV_HEADER_SIZE)
+#define ONENAND_ENV_SIZE(mtd) (mtd.
writesize
- ENV_HEADER_SIZE)
char *env_name_spec = "OneNAND";
char *env_name_spec = "OneNAND";
@@
-52,30
+52,28
@@
static unsigned char onenand_env[MAX_ONENAND_PAGESIZE];
env_t *env_ptr = (env_t *) onenand_env;
#endif /* ENV_IS_EMBEDDED */
env_t *env_ptr = (env_t *) onenand_env;
#endif /* ENV_IS_EMBEDDED */
+DECLARE_GLOBAL_DATA_PTR;
+
uchar env_get_char_spec(int index)
{
uchar env_get_char_spec(int index)
{
- DECLARE_GLOBAL_DATA_PTR;
-
return (*((uchar *) (gd->env_addr + index)));
}
void env_relocate_spec(void)
{
return (*((uchar *) (gd->env_addr + index)));
}
void env_relocate_spec(void)
{
- DECLARE_GLOBAL_DATA_PTR;
unsigned long env_addr;
int use_default = 0;
size_t retlen;
env_addr = CFG_ENV_ADDR;
unsigned long env_addr;
int use_default = 0;
size_t retlen;
env_addr = CFG_ENV_ADDR;
- env_addr -= (unsigned long)onenand_chip.base;
/* Check OneNAND exist */
/* Check OneNAND exist */
- if (onenand_mtd.
oobblock
)
+ if (onenand_mtd.
writesize
)
/* Ignore read fail */
/* Ignore read fail */
- onenand_read(&onenand_mtd, env_addr, onenand_mtd.
oobblock
,
+ onenand_read(&onenand_mtd, env_addr, onenand_mtd.
writesize
,
&retlen, (u_char *) env_ptr);
else
&retlen, (u_char *) env_ptr);
else
- onenand_mtd.
oobblock
= MAX_ONENAND_PAGESIZE;
+ onenand_mtd.
writesize
= MAX_ONENAND_PAGESIZE;
if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) !=
env_ptr->crc)
if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) !=
env_ptr->crc)
@@
-95,23
+93,23
@@
void env_relocate_spec(void)
int saveenv(void)
{
unsigned long env_addr = CFG_ENV_ADDR;
int saveenv(void)
{
unsigned long env_addr = CFG_ENV_ADDR;
- struct erase_info instr;
+ struct erase_info instr = {
+ .callback = NULL,
+ };
size_t retlen;
instr.len = CFG_ENV_SIZE;
instr.addr = env_addr;
size_t retlen;
instr.len = CFG_ENV_SIZE;
instr.addr = env_addr;
- instr.addr -= (unsigned long)onenand_chip.base;
if (onenand_erase(&onenand_mtd, &instr)) {
if (onenand_erase(&onenand_mtd, &instr)) {
- printf("OneNAND: erase failed at 0x%08x\n", env_addr);
+ printf("OneNAND: erase failed at 0x%08
l
x\n", env_addr);
return 1;
}
/* update crc */
env_ptr->crc =
return 1;
}
/* update crc */
env_ptr->crc =
- crc32(0, env_ptr->data,
onenand_mtd.oobblock - ENV_HEADER_SIZE
);
+ crc32(0, env_ptr->data,
ONENAND_ENV_SIZE(onenand_mtd)
);
- env_addr -= (unsigned long)onenand_chip.base;
- if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
+ if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen,
(u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%08x\n", instr.addr);
return 2;
(u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%08x\n", instr.addr);
return 2;
@@
-122,8
+120,6
@@
int saveenv(void)
int env_init(void)
{
int env_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* use default */
gd->env_addr = (ulong) & default_environment[0];
gd->env_valid = 1;
/* use default */
gd->env_addr = (ulong) & default_environment[0];
gd->env_valid = 1;