summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-07-12 17:18:59 -0400
committerTom Rini <trini@ti.com>2013-07-12 17:18:59 -0400
commit8d94e6848fcbddb8b2ef17bc3bd8776a03b8cd5d (patch)
tree7297992ee4f0356a3d19dc47e318b3acfd8588b2
parentb7a1d13462115d2cafb0a3ffcbdce48c2f78f06e (diff)
parent1c903694370259738abccc67ff0d6e5eaf7886f9 (diff)
downloadtalos-obmc-uboot-8d94e6848fcbddb8b2ef17bc3bd8776a03b8cd5d.tar.gz
talos-obmc-uboot-8d94e6848fcbddb8b2ef17bc3bd8776a03b8cd5d.zip
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
-rw-r--r--drivers/mtd/nand/mxc_nand.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index ac435f2050..40b0741f6a 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1242,12 +1242,10 @@ int board_nand_init(struct nand_chip *this)
this->ecc.mode = NAND_ECC_HW;
}
- if (this->ecc.mode == NAND_ECC_HW) {
- if (is_mxc_nfc_1())
- this->ecc.strength = 1;
- else
- this->ecc.strength = 4;
- }
+ if (is_mxc_nfc_1())
+ this->ecc.strength = 1;
+ else
+ this->ecc.strength = 4;
host->pagesize_2k = 0;
OpenPOWER on IntegriCloud