diff options
author | Jie Yang <yang.jie@intel.com> | 2015-10-22 13:55:07 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-22 14:01:51 +0100 |
commit | ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d (patch) | |
tree | c75d7f69dbc0d6aa9e0166f40f9c4bc898b78b1e /sound/soc/intel/common/Makefile | |
parent | 624729fd51871bfbddb647764f180126789a29ee (diff) | |
download | lwn-ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d.tar.gz lwn-ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d.zip |
ASoC: Intel: sst: only use sst-firmware when DW DMAC is available
Currentlly, we use Synopsys DesignWare DMA Controller for
baytrail/haswell/broadwell ADSP firmware loading, but for
skylake, we don't use it, compiling sst-firmware.c may
introduce error when CONFIG_DW_DMAC_CORE is not enabled:
sound/built-in.o: In function `sst_dma_new':
(.text+0xd7b38): undefined reference to `dw_dma_probe'
sound/built-in.o: In function `sst_dma_free':
(.text+0xd7c0a): undefined reference to `dw_dma_remove'
Here we only compile sst-firmware when CONFIG_DW_DMAC_CORE
is selected, to fix the linking error issue.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common/Makefile')
-rw-r--r-- | sound/soc/intel/common/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index f24154ca4e98..d9105584c51f 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,7 +1,11 @@ -snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o +snd-soc-sst-dsp-objs := sst-dsp.o snd-soc-sst-acpi-objs := sst-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o +ifneq ($(CONFIG_DW_DMAC_CORE),) +snd-soc-sst-dsp-objs += sst-firmware.o +endif + obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o |