ASoC: intel: boards: clarify Kconfigs for SOF

Only include boards with HDMI support if SOF has enabled HDA_LINK support.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Author: plbossart

sound/soc/intel/boards/Kconfig

@@ -222,7 +222,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE
 
-if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_APOLLOLAKE
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_APOLLOLAKE && SND_SOC_SOF_HDA_LINK
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
@@ -251,6 +251,10 @@ config SND_SOC_INTEL_BXT_RT298_MACH
 	   Say Y or m if you have such a device. This is a recommended option.
 	   If unsure select "N".
 
+endif
+
+if SND_SOC_SOF_APOLLOLAKE
+
 config SND_SOC_INTEL_BXT_PCM512x_MACH
 	tristate "Broxton with TI PCM512x codec"
 	depends on MFD_INTEL_LPSS && I2C && ACPI
@@ -271,6 +275,10 @@ config SND_SOC_INTEL_BXT_WM8804_MACH
 	  Say Y or m if you have such a device. This is a recommended option.
 	  If unsure select "N".
 
+endif
+
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_APOLLOLAKE
+
 config SND_SOC_INTEL_BXT_TDF8532_MACH
 	tristate "ASoC Audio driver for BXT with TDF8532 in I2S mode"
 	depends on X86 && ACPI && I2C
@@ -341,7 +349,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE
 
-if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_HDA
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_HDA_AUDIO_CODEC
 
 config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 	tristate "SKL/KBL/BXT/APL with HDA Codecs"
@@ -355,7 +363,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_HDA
 
-if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_GEMINILAKE
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_GEMINILAKE && SND_SOC_SOF_HDA_LINK
 
 config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	tristate "GLK with RT5682 and MAX98357A in I2S Mode"
@@ -373,7 +381,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_GEMINILAKE
 
-if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_CANNONLAKE
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_CANNONLAKE && SND_SOC_SOF_HDA_LINK
 
 config SND_SOC_INTEL_CNL_RT274_MACH
 	tristate "Cannonlake with RT274 I2S mode"