| Message ID | 20170815205245.21496-2-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 225bfd3906453c13a0a88b03d8e62a2f267b3689 |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Aug 15, 2017 at 10:52:45PM +0200, Thomas Petazzoni wrote: > do_switch_ecc() calls fsmc_nand_switch_ecc(), which is a direct > function call into drivers/mtd/nand/fsmc_nand.c. However, this > function is not guarded by CONFIG_NAND_FSMC, which results to a build > failure if CONFIG_NAND_FSMC is disabled. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c index be0d14f..7b9dc65 100644 --- a/arch/arm/cpu/arm926ejs/spear/cpu.c +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c @@ -84,7 +84,7 @@ int print_cpuinfo(void) } #endif -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_ECC_BCH) +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_ECC_BCH) && defined(CONFIG_NAND_FSMC) static int do_switch_ecc(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) {
do_switch_ecc() calls fsmc_nand_switch_ecc(), which is a direct function call into drivers/mtd/nand/fsmc_nand.c. However, this function is not guarded by CONFIG_NAND_FSMC, which results to a build failure if CONFIG_NAND_FSMC is disabled. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/cpu/arm926ejs/spear/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)