Skip to contentSkip to conversation

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

PATCH In review Peter Ujfalusi 1 participant 2 messages Nov 7, 2024

Subsystems (3)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

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

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")
---
 sound/soc/sof/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/Kconfig +1 -1
index 2c43558d96b9..e22b5bbb47f0 100644
@@ -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
Signature · 1 line
2.47.0
author maintainer
#1 lore raw
Quoted 2 lines · Peter Ujfalusi

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.

Quoted 21 lines
Fixes b6bd3f3b6357 ("ASoC: Intel: Kconfig: make SND_SOC_ACPI_INTEL_MATCH depend on ACPI")
---
 sound/soc/sof/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/Kconfig +1 -1
index 2c43558d96b9..e22b5bbb47f0 100644
@@ -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
Signature · 1 line
Péter