Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / common / env_onenand.c

diff --git a/common/env_onenand.c b/common/env_onenand.c
index ad5b1d7aa9dde3bd4da3d7429bc4e5c55caa915c..48089a9603833f055726a0b4cbc35f2420ac8521 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -22,9 +22,6 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_IN_ONENAND)     /* Environment is in OneNAND */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -40,7 +37,7 @@ extern struct onenand_chip onenand_chip;
 /* 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";
 
@@ -61,20 +58,19 @@ uchar env_get_char_spec(int index)
 
 void env_relocate_spec(void)
 {
-       unsigned long env_addr;
+       loff_t env_addr;
        int use_default = 0;
        size_t retlen;
 
-       env_addr = CFG_ENV_ADDR;
-       env_addr -= (unsigned long) onenand_chip.base;
+       env_addr = CONFIG_ENV_ADDR;
 
        /* Check OneNAND exist */
-       if (onenand_mtd.oobblock)
+       if (onenand_mtd.writesize)
                /* 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
-               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)
@@ -93,15 +89,15 @@ void env_relocate_spec(void)
 
 int saveenv(void)
 {
-       unsigned long env_addr = CFG_ENV_ADDR;
+       unsigned long env_addr = CONFIG_ENV_ADDR;
        struct erase_info instr = {
                .callback       = NULL,
        };
        size_t retlen;
 
-       instr.len = CFG_ENV_SIZE;
+       instr.len = CONFIG_ENV_SIZE;
        instr.addr = env_addr;
-       instr.addr -= (unsigned long)onenand_chip.base;
+       instr.mtd = &onenand_mtd;
        if (onenand_erase(&onenand_mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
                return 1;
@@ -111,10 +107,9 @@ int saveenv(void)
        env_ptr->crc =
            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);
+               printf("OneNAND: write failed at 0x%llx\n", instr.addr);
                return 2;
        }
 
@@ -129,5 +124,3 @@ int env_init(void)
 
        return 0;
 }
-
-#endif /* CFG_ENV_IS_IN_ONENAND */