diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 12:07:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-02 11:20:24 +0000 |
| commit | f7a88db6fffdd193d792de5dae7890528b995cc0 (patch) | |
| tree | 24920df3c8a8c31e356cf806313a7619e0d7dbf5 /sound/soc/intel | |
| parent | e78407fb7ed38fded024def7a76e4c91bc814080 (diff) | |
| download | linux-f7a88db6fffdd193d792de5dae7890528b995cc0.tar.bz2 | |
ASoC: Intel: fix Kconfig dependencies
I ran into multiple problems during randconfig builds of the
recently changed Kconfig logic for Intel ASoC drivers:
- Building without DMADEVICES doesn't work in general
- With that dependency added, we can relax the 'depends
on X86' again and allow compile-testing, except for
SND_SST_ATOM_HIFI2_PLATFORM, which depends on X86
for asm/platform_sst_audio.h
- Skylake requires SND_SOC_INTEL_SST_ACPI, so we
have to depend on ACPI in turn
- Haswell needs SND_DMA_SGBUF for snd_sgbuf_aligned_pages()
With the new set of dependencies, I no longer get any build
failures.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index a59dda39007e..e18118209b75 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -31,13 +31,14 @@ config SND_SOC_ACPI_INTEL_MATCH config SND_SOC_INTEL_SST_TOPLEVEL tristate "Intel ASoC SST drivers" - depends on X86 + depends on X86 || COMPILE_TEST + depends on DMADEVICES select SND_SOC_INTEL_MACH select SND_SOC_INTEL_COMMON config SND_SOC_INTEL_HASWELL tristate "Intel ASoC SST driver for Haswell/Broadwell" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE @@ -49,12 +50,12 @@ config SND_SOC_INTEL_BAYTRAIL config SND_SST_ATOM_HIFI2_PLATFORM tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && X86 select SND_SOC_COMPRESS config SND_SOC_INTEL_SKYLAKE tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_SOC_TOPOLOGY |