* [PATCH] ASoC: SOF: amd: Fix build error with built-in config
@ 2024-05-10 7:36 Takashi Iwai
2024-05-13 10:49 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Iwai @ 2024-05-10 7:36 UTC (permalink / raw
To: Mark Brown; +Cc: linux-sound, Stephen Rothwell
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")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20240510170305.03b67d9f@canb.auug.org.au
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/sof/amd/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/amd/Makefile b/sound/soc/sof/amd/Makefile
index 380a9769c321..d1424c09172d 100644
--- a/sound/soc/sof/amd/Makefile
+++ b/sound/soc/sof/amd/Makefile
@@ -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
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: SOF: amd: Fix build error with built-in config
2024-05-10 7:36 [PATCH] ASoC: SOF: amd: Fix build error with built-in config Takashi Iwai
@ 2024-05-13 10:49 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2024-05-13 10:49 UTC (permalink / raw
To: Mark Brown; +Cc: linux-sound, Stephen Rothwell
On Fri, 10 May 2024 09:36:54 +0200,
Takashi Iwai wrote:
>
> 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")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Closes: https://lore.kernel.org/r/20240510170305.03b67d9f@canb.auug.org.au
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This seems overlooked, and since the latest ASoC code reached to my
tree, I applied this fix now on my tree.
Takashi
> ---
> sound/soc/sof/amd/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/sof/amd/Makefile b/sound/soc/sof/amd/Makefile
> index 380a9769c321..d1424c09172d 100644
> --- a/sound/soc/sof/amd/Makefile
> +++ b/sound/soc/sof/amd/Makefile
> @@ -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
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-13 10:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-10 7:36 [PATCH] ASoC: SOF: amd: Fix build error with built-in config Takashi Iwai
2024-05-13 10:49 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).