projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootstage: Allow marking a particular line of code
[oweals/u-boot.git]
/
common
/
env_onenand.c
diff --git
a/common/env_onenand.c
b/common/env_onenand.c
index 414447594fd9db03d09abc3bf4b830f3aeaf3504..faa903d2f0251cd2459daef22d6d6514124dc86c 100644
(file)
--- a/
common/env_onenand.c
+++ b/
common/env_onenand.c
@@
-31,33
+31,19
@@
#include <malloc.h>
#include <search.h>
#include <errno.h>
#include <malloc.h>
#include <search.h>
#include <errno.h>
+#include <onenand_uboot.h>
-#include <linux/
mtd/
compat.h>
+#include <linux/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
-extern struct mtd_info onenand_mtd;
-extern struct onenand_chip onenand_chip;
-
-/* References to names in env_common.c */
-extern uchar default_environment[];
-
char *env_name_spec = "OneNAND";
char *env_name_spec = "OneNAND";
-#define ONENAND_MAX_ENV_SIZE
4096
+#define ONENAND_MAX_ENV_SIZE
CONFIG_ENV_SIZE
#define ONENAND_ENV_SIZE(mtd) (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
#define ONENAND_ENV_SIZE(mtd) (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
-#ifdef ENV_IS_EMBEDDED
-extern uchar environment[];
-#endif /* ENV_IS_EMBEDDED */
-
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-uchar env_get_char_spec(int index)
-{
- return (*((uchar *)(gd->env_addr + index)));
-}
-
void env_relocate_spec(void)
{
struct mtd_info *mtd = &onenand_mtd;
void env_relocate_spec(void)
{
struct mtd_info *mtd = &onenand_mtd;
@@
-67,7
+53,7
@@
void env_relocate_spec(void)
int rc;
size_t retlen;
#ifdef ENV_IS_EMBEDDED
int rc;
size_t retlen;
#ifdef ENV_IS_EMBEDDED
- char *buf = (char *)&environment
[0]
;
+ char *buf = (char *)&environment;
#else
loff_t env_addr = CONFIG_ENV_ADDR;
char onenand_env[ONENAND_MAX_ENV_SIZE];
#else
loff_t env_addr = CONFIG_ENV_ADDR;
char onenand_env[ONENAND_MAX_ENV_SIZE];
@@
-83,7
+69,7
@@
void env_relocate_spec(void)
if (mtd->writesize)
/* Ignore read fail */
mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
if (mtd->writesize)
/* Ignore read fail */
mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
- &retlen, (u_char *)buf);
+
&retlen, (u_char *)buf);
else
mtd->writesize = MAX_ONENAND_PAGESIZE;
#endif /* !ENV_IS_EMBEDDED */
else
mtd->writesize = MAX_ONENAND_PAGESIZE;
#endif /* !ENV_IS_EMBEDDED */
@@
-109,7
+95,7
@@
int saveenv(void)
};
res = (char *)&env_new.data;
};
res = (char *)&env_new.data;
- len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+ len = hexport_r(&env_htab, '\0',
0,
&res, ENV_SIZE, 0, NULL);
if (len < 0) {
error("Cannot export environment: errno = %d\n", errno);
return 1;
if (len < 0) {
error("Cannot export environment: errno = %d\n", errno);
return 1;
@@
-133,7
+119,7
@@
int saveenv(void)
}
if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
}
if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
- (u_char *)&env_new)) {
+
(u_char *)&env_new)) {
printf("OneNAND: write failed at 0x%llx\n", instr.addr);
return 2;
}
printf("OneNAND: write failed at 0x%llx\n", instr.addr);
return 2;
}
@@
-144,7
+130,7
@@
int saveenv(void)
int env_init(void)
{
/* use default */
int env_init(void)
{
/* use default */
- gd->env_addr = (ulong)
&
default_environment[0];
+ gd->env_addr = (ulong)
&
default_environment[0];
gd->env_valid = 1;
return 0;
gd->env_valid = 1;
return 0;