diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-11 10:48:19 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-11 10:57:46 +0100 |
| commit | 6748f466a3c85a3a776fe8ae64acbed5d803d829 (patch) | |
| tree | c0bd4ae0601573e5536f017a48c2be276521f21b | |
| parent | 8c3ba6f91c4dd41df066854824ee231d556e8358 (diff) | |
| download | barebox-6748f466a3c85a3a776fe8ae64acbed5d803d829.tar.gz barebox-6748f466a3c85a3a776fe8ae64acbed5d803d829.tar.xz | |
mtd: nand: Make support for syndrome hardware ecc optional
NAND_ECC_HW_SYNDROME is currently not needed by the drivers in barebox,
so make support for it optional again. This has been optional before the
last NAND layer update, just re-add the option. This time drop the
"default y", as this option shouldn't be needed.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 97819e5c0b..339f7a923d 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -12,6 +12,10 @@ config MTD_NAND_ECC_SW_BCH bool prompt "Support software BCH ecc" +config NAND_ECC_HW_SYNDROME + bool + prompt "Support syndrome hardware ecc controllers" + config NAND_ALLOW_ERASE_BAD bool depends on MTD_WRITE diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 2c3c0b360f..0a980e4499 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -5574,6 +5574,10 @@ int nand_scan_tail(struct nand_chip *chip) if (!ecc->write_subpage && ecc->hwctl && ecc->calculate) ecc->write_subpage = nand_write_subpage_hwecc; case NAND_ECC_HW_SYNDROME: + if (!IS_ENABLED(CONFIG_NAND_ECC_HW_SYNDROME)) { + ret = -ENOSYS; + goto err_nand_manuf_cleanup; + } if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) && (!ecc->read_page || ecc->read_page == nand_read_page_hwecc || |