summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-13 01:45:56 +0200
committerWolfgang Denk <wd@denx.de>2008-09-13 01:45:56 +0200
commit508eb85db7065e34948c189c83f7e348c1cfd61e (patch)
treea51f746baf4727fc8d67b4fbe35b1e7f7c1b25b1 /board
parent225f0eaa745adfae05931848543d99942798756a (diff)
parent0008b6d968160abe2bfd936493f3a516a7c8da20 (diff)
downloadu-boot-imx-508eb85db7065e34948c189c83f7e348c1cfd61e.zip
u-boot-imx-508eb85db7065e34948c189c83f7e348c1cfd61e.tar.gz
u-boot-imx-508eb85db7065e34948c189c83f7e348c1cfd61e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board')
-rw-r--r--board/delta/nand.c6
-rw-r--r--board/zylonite/nand.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/board/delta/nand.c b/board/delta/nand.c
index 4ce78a1..ceb798b 100644
--- a/board/delta/nand.c
+++ b/board/delta/nand.c
@@ -58,14 +58,12 @@ static struct nand_bbt_descr delta_bbt_descr = {
.pattern = scan_ff_pattern
};
-static struct nand_oobinfo delta_oob = {
- .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
+static struct nand_ecclayout delta_oob = {
.eccbytes = 6,
.eccpos = {2, 3, 4, 5, 6, 7},
.oobfree = { {8, 2}, {12, 4} }
};
-
/*
* not required for Monahans DFC
*/
@@ -541,6 +539,7 @@ int board_nand_init(struct nand_chip *nand)
nand->cmd_ctrl = dfc_hwcontrol;
/* nand->dev_ready = dfc_device_ready; */
nand->ecc.mode = NAND_ECC_SOFT;
+ nand->ecc.layout = &delta_oob;
nand->options = NAND_BUSWIDTH_16;
nand->waitfunc = dfc_wait;
nand->read_byte = dfc_read_byte;
@@ -549,7 +548,6 @@ int board_nand_init(struct nand_chip *nand)
nand->write_buf = dfc_write_buf;
nand->cmdfunc = dfc_cmdfunc;
-/* nand->autooob = &delta_oob; */
nand->badblock_pattern = &delta_bbt_descr;
return 0;
}
diff --git a/board/zylonite/nand.c b/board/zylonite/nand.c
index 09bcbb2..7f22935 100644
--- a/board/zylonite/nand.c
+++ b/board/zylonite/nand.c
@@ -58,14 +58,12 @@ static struct nand_bbt_descr delta_bbt_descr = {
.pattern = scan_ff_pattern
};
-static struct nand_oobinfo delta_oob = {
- .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
+static struct nand_ecclayout delta_oob = {
.eccbytes = 6,
.eccpos = {2, 3, 4, 5, 6, 7},
.oobfree = { {8, 2}, {12, 4} }
};
-
/*
* not required for Monahans DFC
*/
@@ -545,6 +543,7 @@ int board_nand_init(struct nand_chip *nand)
nand->cmd_ctrl = dfc_hwcontrol;
/* nand->dev_ready = dfc_device_ready; */
nand->ecc.mode = NAND_ECC_SOFT;
+ nand->ecc.layout = &delta_oob;
nand->options = NAND_BUSWIDTH_16;
nand->waitfunc = dfc_wait;
nand->read_byte = dfc_read_byte;
@@ -553,7 +552,6 @@ int board_nand_init(struct nand_chip *nand)
nand->write_buf = dfc_write_buf;
nand->cmdfunc = dfc_cmdfunc;
-/* nand->autooob = &delta_oob; */
nand->badblock_pattern = &delta_bbt_descr;
return 0;
}