diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-25 23:34:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-25 23:34:22 +0200 |
| commit | b97a31165ab042543bac38f692cf98575367afc4 (patch) | |
| tree | 6fc13d6951d24728c29c4f45aa15c84a5e5d9578 /cpu/arm926ejs/davinci/nand.c | |
| parent | 4d56e8dea670757c801a6a65531f02a8f981ce1f (diff) | |
| parent | 079edb913dbae147b50a488cf02e03f473fc5f28 (diff) | |
| download | u-boot-imx-b97a31165ab042543bac38f692cf98575367afc4.zip u-boot-imx-b97a31165ab042543bac38f692cf98575367afc4.tar.gz u-boot-imx-b97a31165ab042543bac38f692cf98575367afc4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu/arm926ejs/davinci/nand.c')
| -rw-r--r-- | cpu/arm926ejs/davinci/nand.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu/arm926ejs/davinci/nand.c b/cpu/arm926ejs/davinci/nand.c index 2aa01d6..5a1da63 100644 --- a/cpu/arm926ejs/davinci/nand.c +++ b/cpu/arm926ejs/davinci/nand.c @@ -90,7 +90,6 @@ static void nand_davinci_select_chip(struct mtd_info *mtd, int chip) #ifdef CFG_NAND_HW_ECC #ifdef CFG_NAND_LARGEPAGE static struct nand_ecclayout davinci_nand_ecclayout = { - .useecc = MTD_NANDECC_AUTOPLACE, .eccbytes = 12, .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, .oobfree = { @@ -103,7 +102,6 @@ static struct nand_ecclayout davinci_nand_ecclayout = { }; #elif defined(CFG_NAND_SMALLPAGE) static struct nand_ecclayout davinci_nand_ecclayout = { - .useecc = MTD_NANDECC_AUTOPLACE, .eccbytes = 3, .eccpos = {0, 1, 2}, .oobfree = { @@ -371,12 +369,11 @@ int board_nand_init(struct nand_chip *nand) nand->options = NAND_USE_FLASH_BBT; #endif #ifdef CFG_NAND_HW_ECC -#ifdef CFG_NAND_LARGEPAGE nand->ecc.mode = NAND_ECC_HW; +#ifdef CFG_NAND_LARGEPAGE nand->ecc.size = 2048; nand->ecc.bytes = 12; #elif defined(CFG_NAND_SMALLPAGE) - nand->ecc.mode = NAND_ECC_HW; nand->ecc.size = 512; nand->ecc.bytes = 3; #else |