Messages in this thread | | | From | Geert Uytterhoeven <> | Date | Fri, 4 Mar 2022 09:55:04 +0100 | Subject | Re: [PATCH] m68k: tweak coldfire/device.c for COMPILE_TEST |
| |
Hi Randy,
On Fri, Mar 4, 2022 at 4:35 AM Randy Dunlap <rdunlap@infradead.org> wrote: > When CONFIG_MCF_EDMA is set (due to COMPILE_TEST, not due to > CONFIG_M5441x), coldfire/device.c has compile errors due to > missing MCFEDMA_* symbols. In the .config file that was provided, > CONFIG_M5206=y, not CONFIG_M5441x, so <asm/m5441xsim.h> is not > included in coldfire/device.c. > > Only build the MCF_EDMA code in coldfire/device.c if both MCF_EDMA > and M5441x are enabled. > > Fixes these build errors: > > ../arch/m68k/coldfire/device.c:512:35: error: 'MCFEDMA_BASE' undeclared here (not in a function); did you mean 'MCFDMA_BASE1'? > 512 | .start = MCFEDMA_BASE, > ../arch/m68k/coldfire/device.c:513:50: error: 'MCFEDMA_SIZE' undeclared here (not in a function) > 513 | .end = MCFEDMA_BASE + MCFEDMA_SIZE - 1, > ../arch/m68k/coldfire/device.c:517:35: error: 'MCFEDMA_IRQ_INTR0' undeclared here (not in a function) > 517 | .start = MCFEDMA_IRQ_INTR0, > ../arch/m68k/coldfire/device.c:523:35: error: 'MCFEDMA_IRQ_INTR16' undeclared here (not in a function) > 523 | .start = MCFEDMA_IRQ_INTR16, > ../arch/m68k/coldfire/device.c:529:35: error: 'MCFEDMA_IRQ_INTR56' undeclared here (not in a function) > 529 | .start = MCFEDMA_IRQ_INTR56, > ../arch/m68k/coldfire/device.c:535:35: error: 'MCFEDMA_IRQ_ERR' undeclared here (not in a function) > 535 | .start = MCFEDMA_IRQ_ERR, > > Fixes: d7e9d01ac292 ("m68k: add ColdFire mcf5441x eDMA platform support") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Thanks for your patch!
> --- linux-next-20220303.orig/arch/m68k/coldfire/device.c > +++ linux-next-20220303/arch/m68k/coldfire/device.c > @@ -480,7 +480,7 @@ static struct platform_device mcf_i2c5 = > #endif /* MCFI2C_BASE5 */ > #endif /* IS_ENABLED(CONFIG_I2C_IMX) */ > > -#if IS_ENABLED(CONFIG_MCF_EDMA) > +#if IS_ENABLED(CONFIG_MCF_EDMA) && IS_ENABLED(CONFIG_M5441x)
As this protects hardware description, I'm wondering if this and below shouldn't just be"#ifdef CONFIG_M5441x"?
See also commit 322c512f476f07e9 ("m68knommu: include SDHC support only when hardware has it")
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |