diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-12-05 10:05:01 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-12-05 10:05:01 +0800 |
| commit | b1c4a87b038bc4aff5c38a17e50975a873e6ee1f (patch) | |
| tree | 3202ba799de934b47a0c9fe4f4d329de4c4a6ec6 | |
| parent | 587aa30fdfb5bc27f9568b62395ff9855ae91b00 (diff) | |
atmel_nand: add CONFIG_SYS_NAND_ONFI_DETECTION macro, otherwise it will meet compile error when CONFIG_SYS_NAND_ONFI_DETECTION is not defined.
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 8a5dce2e58..aff9aa028f 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -675,6 +675,7 @@ static void atmel_pmecc_core_init(struct mtd_info *mtd) pmecc_writel(host->pmecc, ctrl, PMECC_CTRL_ENABLE); } +#ifdef CONFIG_SYS_NAND_ONFI_DETECTION static int pmecc_choose_ecc_bits(int pre_ecc_bits, struct nand_chip *nand_chip) { int ecc_bits = pre_ecc_bits; @@ -712,6 +713,7 @@ static int pmecc_choose_ecc_bits(int pre_ecc_bits, struct nand_chip *nand_chip) return ecc_bits; } } +#endif static int atmel_pmecc_nand_init_params(struct nand_chip *nand, struct mtd_info *mtd) @@ -726,9 +728,13 @@ static int atmel_pmecc_nand_init_params(struct nand_chip *nand, nand->ecc.correct = NULL; nand->ecc.hwctl = NULL; +#ifdef CONFIG_SYS_NAND_ONFI_DETECTION /* Choose PMECC ecc bits according to ONFI parameters */ host->pmecc_corr_cap = pmecc_choose_ecc_bits(CONFIG_PMECC_CAP, nand); cap = host->pmecc_corr_cap; +#else + cap = host->pmecc_corr_cap = CONFIG_PMECC_CAP; +#endif sector_size = host->pmecc_sector_size = CONFIG_PMECC_SECTOR_SIZE; host->pmecc_index_table_offset = CONFIG_PMECC_INDEX_TABLE_OFFSET; |