Skip to content

Commit fa555b5

Browse files
arndbvinodkoul
authored andcommitted
dmaengine: fsl-edma: avoid linking both modules
Kbuild does not support having a source file compiled multiple times and linked into distinct modules, or built-in and modular at the same time. For fs-edma, there are two common components that are linked into the fsl-edma.ko for Arm and PowerPC, plus the mcf-edma.ko module on Coldfire. This violates the rule for compile-testing: scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-common.o is added to multiple modules: fsl-edma mcf-edma scripts/Makefile.build:236: drivers/dma/Makefile: fsl-edma-trace.o is added to multiple modules: fsl-edma mcf-edma I tried splitting out the common parts into a separate modules, but that adds back the complexity that a cleanup patch removed, and it gets harder with the addition of the tracepoints. As a minimal workaround, address it at the Kconfig level, by disallowing the broken configurations. Link: https://lore.kernel.org/lkml/[email protected]/ Fixes: 66aac8e ("dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c") Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Peng Fan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 29b7cd2 commit fa555b5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/dma/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ config LS2X_APB_DMA
394394

395395
config MCF_EDMA
396396
tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
397-
depends on M5441x || COMPILE_TEST
397+
depends on M5441x || (COMPILE_TEST && FSL_EDMA=n)
398398
select DMA_ENGINE
399399
select DMA_VIRTUAL_CHANNELS
400400
help

0 commit comments

Comments
 (0)