Skip to contentSkip to conversation

ASoC: fsl: Fix multiple symbol definitions

PATCH In review Thierry Reding 3 participants 4 messages Jan 30, 2013 – Jan 31, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: fsl: Fix multiple symbol definitions

Commit 25b8d31 (ASoC: fsl: fix multiple definition of init_module) fixed a build error due to multiple symbol definitions when building as a module. However, it causes the build to break when the driver is builtin because the imx-pcm.o object is included multiple times. Solve the issue by adding imx-pcm.o to each of the modules that require it, but only add it to the kernel once when one or both drivers are builtin.

---
 sound/soc/fsl/Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
sound/soc/fsl/Makefile +12 -9
index ec14579..8446d49 100644
@@ -30,21 +30,24 @@ obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
 # i.MX Platform Support
 snd-soc-imx-ssi-objs := imx-ssi.o
 snd-soc-imx-audmux-objs := imx-audmux.o
-snd-soc-imx-pcm-objs := imx-pcm.o
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
-	snd-soc-imx-pcm-objs += imx-pcm-fiq.o
-endif
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
-	snd-soc-imx-pcm-objs += imx-pcm-dma.o
-endif
 
 obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
 obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
 
 obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o
-snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o
+snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o
+ifeq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),m)
+snd-soc-imx-pcm-fiq-y += imx-pcm.o
+else
+obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm.o
+endif
 obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o
-snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o
+snd-soc-imx-pcm-dma-y := imx-pcm-dma.o
+ifeq ($(CONFIG_SND_SOC_IMX_PCM_DMA),m)
+snd-soc-imx-pcm-dma-y := imx-pcm.o
+else
+obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm.o
+endif
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 8 lines · Thierry Reding

Commit 25b8d31 (ASoC: fsl: fix multiple definition of init_module) fixed a build error due to multiple symbol definitions when building as a module. However, it causes the build to break when the driver is builtin because the imx-pcm.o object is included multiple times. Solve the issue by adding imx-pcm.o to each of the modules that require it, but only add it to the kernel once when one or both drivers are builtin.

Thanks, Thierry. The Kconfig is already complex. To avoid having them even more complex, I have chosen to revert my patch and have a little surgery on the code [1] to make it match the Kconfig rational.

Shawn

[1] http://thread.gmane.org/gmane.linux.alsa.devel/105018

Quoted 45 lines
---
 sound/soc/fsl/Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
sound/soc/fsl/Makefile +12 -9
index ec14579..8446d49 100644
@@ -30,21 +30,24 @@ obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
 # i.MX Platform Support
 snd-soc-imx-ssi-objs := imx-ssi.o
 snd-soc-imx-audmux-objs := imx-audmux.o
-snd-soc-imx-pcm-objs := imx-pcm.o
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
-	snd-soc-imx-pcm-objs += imx-pcm-fiq.o
-endif
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
-	snd-soc-imx-pcm-objs += imx-pcm-dma.o
-endif
 
 obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
 obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
 
 obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o
-snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o
+snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o
+ifeq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),m)
+snd-soc-imx-pcm-fiq-y += imx-pcm.o
+else
+obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm.o
+endif
 obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o
-snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o
+snd-soc-imx-pcm-dma-y := imx-pcm-dma.o
+ifeq ($(CONFIG_SND_SOC_IMX_PCM_DMA),m)
+snd-soc-imx-pcm-dma-y := imx-pcm.o
+else
+obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm.o
+endif
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 10 lines · Shawn Guo
Quoted 8 lines · Thierry Reding

Commit 25b8d31 (ASoC: fsl: fix multiple definition of init_module) fixed a build error due to multiple symbol definitions when building as a module. However, it causes the build to break when the driver is builtin because the imx-pcm.o object is included multiple times. Solve the issue by adding imx-pcm.o to each of the modules that require it, but only add it to the kernel once when one or both drivers are builtin.

Quoted 7 lines

Thanks, Thierry. The Kconfig is already complex. To avoid having them even more complex, I have chosen to revert my patch and have a little surgery on the code [1] to make it match the Kconfig rational.

Shawn

[1] http://thread.gmane.org/gmane.linux.alsa.devel/105018

That does indeed look much better than fiddling with the Makefile. My automated ARM builds of linux-next were failing for a few days because of this, so I guess the fix (as well as the MMC one) just hadn't made it into linux-next yet.

Thierry

#3 lore raw
Quoted 4 lines · Thierry Reding

That does indeed look much better than fiddling with the Makefile. My automated ARM builds of linux-next were failing for a few days because of this, so I guess the fix (as well as the MMC one) just hadn't made it into linux-next yet.

The last -next was on the 29th, once it's rebuilt the fix should be there.