delta, zylonite: Update nand_oobinfo to nand_ecclayout.

[u-boot] / board / delta / nand.c

diff --git a/board/delta/nand.c b/board/delta/nand.c
index 4ce78a1e1da8ce8dc4e4e1dfe7d7586366d72303..ceb798bd2d3321db6c3ee95b56862b739c692e97 100644 (file)
--- 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;
 }