[PATCH] Fix build of OMAP sound drivers

[PATCH] Fix build of OMAP sound drivers

[Olof Johansson]

There are build errors when building for some of the omap2/3 boards without
enabling sound:

sound/built-in.o:(.data+0x43bc): undefined reference to `soc_codec_dev_tlv320aic23'
sound/built-in.o:(.data+0x43cc): undefined reference to `tlv320aic23_dai'

Confused me quite a bit since the drivers that had references to the
codec weren't enabled. Turns out the Makefile was using the wrong
config option to enable them. Patch below.



Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index d49458a..3db8a6c 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -23,9 +23,9 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
 obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
 obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
 obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
-obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o
-obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o
-obj-$(CONFIG_MACH_OMAP3517EVM) += snd-soc-am3517evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o
 obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o

Re: [PATCH] Fix build of OMAP sound drivers

[Liam Girdwood]

On Thu, 2009-12-10 at 11:15 -0600, Olof Johansson wrote:
> There are build errors when building for some of the omap2/3 boards without
> enabling sound:
> 
> sound/built-in.o:(.data+0x43bc): undefined reference to `soc_codec_dev_tlv320aic23'
> sound/built-in.o:(.data+0x43cc): undefined reference to `tlv320aic23_dai'
> 
> Confused me quite a bit since the drivers that had references to the
> codec weren't enabled. Turns out the Makefile was using the wrong
> config option to enable them. Patch below.
> 
> 
> 
> Reported-by: Anand Gadiyar <gadiyar@ti.com>
> Signed-off-by: Olof Johansson <olof@lixom.net>

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

> 
> diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
> index d49458a..3db8a6c 100644
> --- a/sound/soc/omap/Makefile
> +++ b/sound/soc/omap/Makefile
> @@ -23,9 +23,9 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
>  obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
>  obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
>  obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
> -obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o
> -obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o
> -obj-$(CONFIG_MACH_OMAP3517EVM) += snd-soc-am3517evm.o
> +obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o
> +obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
> +obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o
>  obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
>  obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
>  obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] Fix build of OMAP sound drivers

[Mark Brown]

On Thu, Dec 10, 2009 at 11:15:55AM -0600, Olof Johansson wrote:
> There are build errors when building for some of the omap2/3 boards without
> enabling sound:

Applied, thanks.

[APPLIED] [PATCH] Fix build of OMAP sound drivers

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-testing

Initial commit ID (Likely to change): 7377799a37dedffef22a9d4dfcbd24592e729c5a

PatchWorks
http://patchwork.kernel.org/patch/66305/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=7377799a37dedffef22a9d4dfcbd24592e729c5a