karo: tx6: fix miscalculated start block for 'romupdate' command

[karo-tx-uboot.git] / board / karo / tx6 / flash.c

diff --git a/board/karo/tx6/flash.c b/board/karo/tx6/flash.c
index cda315a33e409bfaa994f8a5e471f7ec2dd3741e..dcd94164964b8f2a0403d5a2d24cfe0d603128b0 100644 (file)
--- a/board/karo/tx6/flash.c
+++ b/board/karo/tx6/flash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright (C) 2012-2016 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -365,9 +365,9 @@ static int tx6_prog_uboot(void *addr, int start_block, int skip,
        nand_erase_options_t erase_opts = { 0, };
        size_t actual;
        size_t prg_length = max_len - skip * mtd->erasesize;
-       int prg_start = (start_block + skip) * mtd->erasesize;
+       int prg_start = start_block * mtd->erasesize;
 
-       erase_opts.offset = start_block * mtd->erasesize;
+       erase_opts.offset = (start_block - skip) * mtd->erasesize;
        erase_opts.length = max_len;
        erase_opts.quiet = 1;
 
@@ -386,7 +386,7 @@ static int tx6_prog_uboot(void *addr, int start_block, int skip,
        if (doit) {
                actual = size;
                ret = nand_write_skip_bad(mtd, prg_start, &actual, NULL,
-                                       prg_length, addr, WITH_DROP_FFS);
+                                       prg_length, addr, 0);
                if (ret) {
                        printf("Failed to program flash: %d\n", ret);
                        return ret;
@@ -676,7 +676,7 @@ int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        }
 
        printf("Programming U-Boot image from %p to block %lu @ %08llx\n",
-               buf, fw1_start_block, (u64)fw1_start_block * mtd->erasesize);
+               addr, fw1_start_block, (u64)fw1_start_block * mtd->erasesize);
        ret = tx6_prog_uboot(addr, fw1_start_block, fw1_skip, size,
                        max_len1);