diff options
| author | Tom Rini <trini@ti.com> | 2013-07-01 10:11:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-01 10:11:56 -0400 |
| commit | 5a34d9bf31a021987f97f20aefa812b97b58584e (patch) | |
| tree | dd60935e6109fe122cf6dc3bb0f1579a401cc29e /common | |
| parent | e6bf18dba2a21bebf2c421b1c2e188225f6485a1 (diff) | |
| parent | 8b6b51a617b8adc773cc82b4886738a6128caf7f (diff) | |
| download | u-boot-imx-5a34d9bf31a021987f97f20aefa812b97b58584e.zip u-boot-imx-5a34d9bf31a021987f97f20aefa812b97b58584e.tar.gz u-boot-imx-5a34d9bf31a021987f97f20aefa812b97b58584e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nand.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 8b1e01a..886212a 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -426,7 +426,7 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, } /* Adjust a chip/partition size down for bad blocks so we don't - * read/write/erase past the end of a chip/partition by accident. + * read/write past the end of a chip/partition by accident. */ static void adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev) { @@ -546,7 +546,6 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int scrub = !strncmp(cmd, "scrub", 5); int spread = 0; int args = 2; - int adjust_size = 0; const char *scrub_warn = "Warning: " "scrub option will erase all factory set bad blocks!\n" @@ -563,10 +562,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) spread = 1; } else if (!strcmp(&cmd[5], ".part")) { args = 1; - adjust_size = 1; } else if (!strcmp(&cmd[5], ".chip")) { args = 0; - adjust_size = 1; } else { goto usage; } @@ -586,10 +583,6 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) &maxsize) != 0) return 1; - /* size is unspecified */ - if (adjust_size && !scrub) - adjust_size_for_badblocks(&size, off, dev); - nand = &nand_info[dev]; memset(&opts, 0, sizeof(opts)); |