From 0c99d876def2626fc9065126f1db605e230567f5 Mon Sep 17 00:00:00 2001 From: Jindong Date: Wed, 16 Sep 2020 15:21:35 +0800 Subject: MA-17897 ASoC: fsl_dsp: Support building as module Make fsl_dsp_cpu as a separate driver, otherwise below build error will occur when set CONFIG_SND_SOC_FSL_DSP=m ld.lld: error: duplicate symbol: init_module >>> defined at fsl_dsp.c >>> sound/soc/fsl/fsl_dsp.o:(init_module) >>> defined at fsl_dsp_cpu.c >>> sound/soc/fsl/fsl_dsp_cpu.o:(.init.text+0x0) Signed-off-by: Jindong Reviewed-by: Shengjiu Wang --- sound/soc/fsl/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sound/soc/fsl/Makefile') diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 3985a983434d..5b4a150b865c 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -16,8 +16,9 @@ snd-soc-fsl-audmix-objs := fsl_audmix.o snd-soc-fsl-dsp-audiomix-objs := fsl_dsp_audiomix.o snd-soc-fsl-asrc-objs := fsl_asrc.o fsl_asrc_dma.o snd-soc-fsl-dsp-objs := fsl_dsp.o fsl_dsp_proxy.o fsl_dsp_pool.o \ - fsl_dsp_library_load.o fsl_dsp_xaf_api.o fsl_dsp_cpu.o \ + fsl_dsp_library_load.o fsl_dsp_xaf_api.o \ fsl_dsp_platform_compress.o +snd-soc-fsl-dsp-cpu-objs := fsl_dsp_cpu.o snd-soc-fsl-sai-objs := fsl_sai.o fsl_sai_sysfs.o snd-soc-fsl-ssi-y := fsl_ssi.o snd-soc-fsl-ssi-$(CONFIG_DEBUG_FS) += fsl_ssi_dbg.o @@ -38,6 +39,7 @@ obj-$(CONFIG_SND_SOC_FSL_ASOC_CARD) += snd-soc-fsl-asoc-card.o snd-soc-fsl-hdmi-objs := fsl_hdmi.o obj-$(CONFIG_SND_SOC_FSL_ASRC) += snd-soc-fsl-asrc.o obj-$(CONFIG_SND_SOC_FSL_DSP) += snd-soc-fsl-dsp.o +obj-$(CONFIG_SND_SOC_FSL_DSP_CPU) += snd-soc-fsl-dsp-cpu.o obj-$(CONFIG_SND_SOC_FSL_DSP_AUDIOMIX) += snd-soc-fsl-dsp-audiomix.o obj-$(CONFIG_SND_SOC_FSL_SAI) += snd-soc-fsl-sai.o obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o -- cgit v1.2.3