|
@@ -31,14 +31,12 @@
|
|
#include <malloc.h>
|
|
#include <malloc.h>
|
|
#include <search.h>
|
|
#include <search.h>
|
|
#include <errno.h>
|
|
#include <errno.h>
|
|
|
|
+#include <onenand_uboot.h>
|
|
|
|
|
|
#include <linux/mtd/compat.h>
|
|
#include <linux/mtd/compat.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/onenand.h>
|
|
#include <linux/mtd/onenand.h>
|
|
|
|
|
|
-extern struct mtd_info onenand_mtd;
|
|
|
|
-extern struct onenand_chip onenand_chip;
|
|
|
|
-
|
|
|
|
char *env_name_spec = "OneNAND";
|
|
char *env_name_spec = "OneNAND";
|
|
|
|
|
|
#define ONENAND_MAX_ENV_SIZE 4096
|
|
#define ONENAND_MAX_ENV_SIZE 4096
|
|
@@ -48,7 +46,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
uchar env_get_char_spec(int index)
|
|
uchar env_get_char_spec(int index)
|
|
{
|
|
{
|
|
- return (*((uchar *)(gd->env_addr + index)));
|
|
|
|
|
|
+ return *((uchar *)(gd->env_addr + index));
|
|
}
|
|
}
|
|
|
|
|
|
void env_relocate_spec(void)
|
|
void env_relocate_spec(void)
|
|
@@ -76,7 +74,7 @@ void env_relocate_spec(void)
|
|
if (mtd->writesize)
|
|
if (mtd->writesize)
|
|
/* Ignore read fail */
|
|
/* Ignore read fail */
|
|
mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
|
|
mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
|
|
- &retlen, (u_char *)buf);
|
|
|
|
|
|
+ &retlen, (u_char *)buf);
|
|
else
|
|
else
|
|
mtd->writesize = MAX_ONENAND_PAGESIZE;
|
|
mtd->writesize = MAX_ONENAND_PAGESIZE;
|
|
#endif /* !ENV_IS_EMBEDDED */
|
|
#endif /* !ENV_IS_EMBEDDED */
|
|
@@ -126,7 +124,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);
|
|
printf("OneNAND: write failed at 0x%llx\n", instr.addr);
|
|
return 2;
|
|
return 2;
|
|
}
|
|
}
|
|
@@ -137,7 +135,7 @@ int saveenv(void)
|
|
int env_init(void)
|
|
int env_init(void)
|
|
{
|
|
{
|
|
/* use default */
|
|
/* use default */
|
|
- gd->env_addr = (ulong) & default_environment[0];
|
|
|
|
|
|
+ gd->env_addr = (ulong)&default_environment[0];
|
|
gd->env_valid = 1;
|
|
gd->env_valid = 1;
|
|
|
|
|
|
return 0;
|
|
return 0;
|