diff mbox series

ASoC: SOF: Intel: Kconfig: Add ACPI condition for ACPI_INTEL_MATCH in INTEL_COMMON

Message ID 20241107071825.12704-1-peter.ujfalusi@linux.intel.com (mailing list archive)
State New
Headers show
Series ASoC: SOF: Intel: Kconfig: Add ACPI condition for ACPI_INTEL_MATCH in INTEL_COMMON | expand

Commit Message

Peter Ujfalusi Nov. 7, 2024, 7:18 a.m. UTC
Only select SND_SOC_ACPI_INTEL_MATCH via SND_SOC_SOF_INTEL_COMMON if ACPI
is enabled.

Fixes: b6bd3f3b6357 ("ASoC: Intel: Kconfig: make SND_SOC_ACPI_INTEL_MATCH depend on ACPI")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202411070806.UhCRpZok-lkp@intel.com/
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 sound/soc/sof/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Ujfalusi Nov. 7, 2024, 7:52 a.m. UTC | #1
On 07/11/2024 09:18, Peter Ujfalusi wrote:
> Only select SND_SOC_ACPI_INTEL_MATCH via SND_SOC_SOF_INTEL_COMMON if ACPI
> is enabled.

Still not quite right. This can result:
ld: sound/soc/sof/intel/pci-apl.o:(.rodata+0x80): undefined reference to `snd_soc_acpi_intel_glk_machines'
ld: sound/soc/sof/intel/pci-apl.o:(.rodata+0x140): undefined reference to `snd_soc_acpi_intel_bxt_machines'

Please ignore this patch until I sort this out.
 
> Fixes: b6bd3f3b6357 ("ASoC: Intel: Kconfig: make SND_SOC_ACPI_INTEL_MATCH depend on ACPI")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202411070806.UhCRpZok-lkp@intel.com/
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
> ---
>  sound/soc/sof/intel/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
> index 2c43558d96b9..e22b5bbb47f0 100644
> --- a/sound/soc/sof/intel/Kconfig
> +++ b/sound/soc/sof/intel/Kconfig
> @@ -26,7 +26,7 @@ config SND_SOC_SOF_INTEL_ATOM_HIFI_EP
>  config SND_SOC_SOF_INTEL_COMMON
>  	tristate
>  	select SND_SOC_SOF
> -	select SND_SOC_ACPI_INTEL_MATCH
> +	select SND_SOC_ACPI_INTEL_MATCH if ACPI
>  	select SND_SOC_SOF_XTENSA
>  	select SND_SOC_INTEL_MACH
>  	select SND_SOC_ACPI if ACPI
diff mbox series

Patch

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 2c43558d96b9..e22b5bbb47f0 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -26,7 +26,7 @@  config SND_SOC_SOF_INTEL_ATOM_HIFI_EP
 config SND_SOC_SOF_INTEL_COMMON
 	tristate
 	select SND_SOC_SOF
-	select SND_SOC_ACPI_INTEL_MATCH
+	select SND_SOC_ACPI_INTEL_MATCH if ACPI
 	select SND_SOC_SOF_XTENSA
 	select SND_SOC_INTEL_MACH
 	select SND_SOC_ACPI if ACPI