diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-04 20:20:25 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-04 20:20:25 (GMT) |
| commit | 4f7549d2dc00023c5f33d1adc7fee0a77575fcb2 (patch) | |
| tree | f87d6f02fe74f832d18ab8c11feb0978da53014a /drivers/mtd/nand/nand_base.c | |
| parent | 1fed668b3fb9c35932f58af00ff5539239fa4e1d (diff) | |
| parent | 169de9059f24f50c4c7ac794ded060b2c133a29c (diff) | |
| download | u-boot-fsl-qoriq-4f7549d2dc00023c5f33d1adc7fee0a77575fcb2.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash:
PPC: Fix socrates NAND problem
PPC: Fix fsl_upm.c by renaming nand handling functions
NAND: Make page, erase, oob size available via cmd_nand
mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
NAND: Add -y option to nand scrub command
NAND: Add nand read.raw and write.raw commands
NAND: Really ignore bad blocks when scrubbing
spl, nand: add 4bit HW ecc oob first nand_read_page function
mxc_nand: fix a problem writing more than 32MB
mxc_nand: fixed some typos (cosmetic)
nand: increase chip_delay in mv kirkwood nand driver
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e7dfcb1..6aac6a2 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2224,7 +2224,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, /* * heck if we have a bad block, we do not erase bad blocks ! */ - if (nand_block_checkbad(mtd, ((loff_t) page) << + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { printk(KERN_WARNING "nand_erase: attempt to erase a " "bad block at page 0x%08x\n", page); |