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

[people/ms/u-boot.git] / common / cmd_onenand.c

diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index ce99a38ca52174f4fea186d0cec02fded6fd198d..419bf70988f96e01e008ec5b97c20ef4558bb94e 100644 (file)
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -38,7 +38,7 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        onenand_init();
                        return 0;
                }
-               onenand_print_device_info(onenand_chip.device_id, 1);
+               printf("%s\n", onenand_mtd.name);
                return 0;
 
        default:
@@ -58,8 +58,6 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        } else {
                                start = simple_strtoul(argv[2], NULL, 10);
                                end = simple_strtoul(argv[3], NULL, 10);
-                               start -= (unsigned long)onenand_chip.base;
-                               end -= (unsigned long)onenand_chip.base;
 
                                start >>= onenand_chip.erase_shift;
                                end >>= onenand_chip.erase_shift;
@@ -92,8 +90,6 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        size_t retlen = 0;
                        int oob = strncmp(argv[1], "read.oob", 8) ? 0 : 1;
 
-                       ofs -= (unsigned long)onenand_chip.base;
-
                        if (oob)
                                onenand_read_oob(&onenand_mtd, ofs, len,
                                                 &retlen, (u_char *) addr);
@@ -111,8 +107,6 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        size_t len = simple_strtoul(argv[4], NULL, 16);
                        size_t retlen = 0;
 
-                       ofs -= (unsigned long)onenand_chip.base;
-
                        onenand_write(&onenand_mtd, ofs, len, &retlen,
                                      (u_char *) addr);
                        printf("Done\n");