summaryrefslogtreecommitdiffstats
path: root/drivers/nand
diff options
context:
space:
mode:
authorEric Benard <eric@eukrea.com>2009-10-22 16:45:00 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-10-23 09:42:01 +0200
commit8b05f7528cd9bccb0dffe7fa3606c7280a21f82d (patch)
tree3e4d1facf766d69638769edb6d5c0417d25a883a /drivers/nand
parent14eb08260698b6263f8d9583596474fd8c62acc5 (diff)
downloadbarebox-8b05f7528cd9bccb0dffe7fa3606c7280a21f82d.tar.gz
barebox-8b05f7528cd9bccb0dffe7fa3606c7280a21f82d.tar.xz
imx-nand : remove wrong part of commit ca326e88827e08e723046a21b18e74d41d15ace7
previous fix for 2k pages was wrong so remove it Signed-off-by: Eric Benard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/nand')
-rw-r--r--drivers/nand/nand_imx.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index bda8ecf4bf..ee8f0f427b 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -969,14 +969,6 @@ static void imx_low_erase(struct mtd_info *mtd)
*
* @return The function always returns 0.
*/
-static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
-
-static struct nand_bbt_descr smallpage_memorybased = {
- .options = NAND_BBT_SCAN2NDPAGE,
- .offs = 5,
- .len = 1,
- .pattern = scan_ff_pattern
-};
static int __init imxnd_probe(struct device_d *dev)
{
@@ -1067,12 +1059,7 @@ static int __init imxnd_probe(struct device_d *dev)
this->ecc.layout = &nand_hw_eccoob_16;
}
- if (pdata->is2k) {
- host->pagesize_2k = 1;
- NFMS |= (1 << NFMS_BIT);
- this->badblock_pattern = &smallpage_memorybased;
- } else
- host->pagesize_2k = 0;
+ host->pagesize_2k = 0;
this->options |= NAND_SKIP_BBTSCAN;