diff options
| author | Scott Wood <scottwood@freescale.com> | 2008-09-10 11:48:49 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2008-09-10 11:48:49 -0500 |
| commit | 6644641d072aee3087da129d8443187196a4d8a9 (patch) | |
| tree | 35866d8ed8e60d32b39714f61cbb3ede8b3e8fc2 | |
| parent | 9b05aa788bfdd3264ff1bc9418cb19550a7234e4 (diff) | |
delta, zylonite: Update nand_oobinfo to nand_ecclayout.
This is part of the switch to newer upstream MTD code.
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | board/delta/nand.c | 6 | ||||
| -rw-r--r-- | board/zylonite/nand.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/board/delta/nand.c b/board/delta/nand.c index 4ce78a1e1da..ceb798bd2d3 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 09bcbb233d2..7f229352302 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; } |