omap_gpmc: use SOFTECC in SPL if it's enabled
authorIlya Yanok <yanok@emcraft.com>
Mon, 28 Nov 2011 06:37:38 +0000 (06:37 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 6 Dec 2011 22:59:36 +0000 (23:59 +0100)
Use software ECC for the SPL build if support for software ECC in SPL is
enabled.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Acked-by: Scott Wood <scottwood@freescale.com>
drivers/mtd/nand/omap_gpmc.c

index 5bbec48be2600b39748ac70a2d6ee304273241fc..1dfe074e1e13c4e64f760bdcd91a5b7d95780c7b 100644 (file)
@@ -348,7 +348,7 @@ int board_nand_init(struct nand_chip *nand)
 
        nand->chip_delay = 100;
        /* Default ECC mode */
-#ifndef CONFIG_SPL_BUILD
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_NAND_SOFTECC)
        nand->ecc.mode = NAND_ECC_SOFT;
 #else
        nand->ecc.mode = NAND_ECC_HW;
@@ -359,7 +359,9 @@ int board_nand_init(struct nand_chip *nand)
        nand->ecc.correct = omap_correct_data;
        nand->ecc.calculate = omap_calculate_ecc;
        omap_hwecc_init(nand);
+#endif
 
+#ifdef CONFIG_SPL_BUILD
        if (nand->options & NAND_BUSWIDTH_16)
                nand->read_buf = nand_read_buf16;
        else