Skip to contentSkip to conversation

ASoC: SOF: amd: Fix build error with built-in config

PATCH In review Takashi Iwai 1 participant 2 messages May 10, 2024 – May 13, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: SOF: amd: Fix build error with built-in config

Makefile in AMD ACP driver has a line substitution with "=" instead of "+="; this overrides the preexisting item, hence it broke the build after the recent change to replace *-objs with *-y.

This patch corrects the line.

Fixes 1a74b21ce59f ("ASoC: SOF: amd: Add Probe functionality support for amd platforms.")
Fixes 9c2f5b6eb8b7 ("ASoC: SOF: Use *-y instead of *-objs in Makefile")
---
 sound/soc/sof/amd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/amd/Makefile +1 -1
index 380a9769c321..d1424c09172d 100644
@@ -5,7 +5,7 @@
 # Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. All rights reserved.
 
 snd-sof-amd-acp-y := acp.o acp-loader.o acp-ipc.o acp-pcm.o acp-stream.o acp-trace.o acp-common.o
-snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) = acp-probes.o
+snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) += acp-probes.o
 snd-sof-amd-renoir-y := pci-rn.o renoir.o
 snd-sof-amd-rembrandt-y := pci-rmb.o rembrandt.o
 snd-sof-amd-vangogh-y := pci-vangogh.o vangogh.o
Signature · 1 line
2.43.0
#1 lore raw
Quoted 5 lines · Takashi Iwai

Makefile in AMD ACP driver has a line substitution with "=" instead of "+="; this overrides the preexisting item, hence it broke the build after the recent change to replace *-objs with *-y.

Quoted 7 lines

This patch corrects the line.

Fixes 1a74b21ce59f ("ASoC: SOF: amd: Add Probe functionality support for amd platforms.")
Fixes 9c2f5b6eb8b7 ("ASoC: SOF: Use *-y instead of *-objs in Makefile")

This seems overlooked, and since the latest ASoC code reached to my tree, I applied this fix now on my tree.

Takashi

Quoted 20 lines
---
 sound/soc/sof/amd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/amd/Makefile +1 -1
index 380a9769c321..d1424c09172d 100644
@@ -5,7 +5,7 @@
 # Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. All rights reserved.
 
 snd-sof-amd-acp-y := acp.o acp-loader.o acp-ipc.o acp-pcm.o acp-stream.o acp-trace.o acp-common.o
-snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) = acp-probes.o
+snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) += acp-probes.o
 snd-sof-amd-renoir-y := pci-rn.o renoir.o
 snd-sof-amd-rembrandt-y := pci-rmb.o rembrandt.o
 snd-sof-amd-vangogh-y := pci-vangogh.o vangogh.o
Signature · 1 line
2.43.0