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 09a79d01918acde9250c6467e6611ed3d39507a6..48089a9603833f055726a0b4cbc35f2420ac8521 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -58,11 +58,11 @@ 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 = CONFIG_ENV_ADDR;
 
        /* Check OneNAND exist */
        if (onenand_mtd.writesize)
@@ -89,14 +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.mtd = &onenand_mtd;
        if (onenand_erase(&onenand_mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
                return 1;
@@ -108,7 +109,7 @@ int saveenv(void)
 
        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;
        }