ASoC: SOF: Makefile - fix the top-level kernel module names (add snd- prefix)
Subsystems (3)
Jaroslav Kysela
maintainerPATCH 1/1 ASoC: SOF: Makefile - fix the top-level kernel module names (add snd- prefix)
Use the proper module name. The objs assignments are already there.
--- sound/soc/sof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sof/Makefile +2 -2
@@ -11,8 +11,8 @@ obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o -obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o -obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o +obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi-dev.o +obj-$(CONFIG_SND_SOC_SOF_PCI) += snd-sof-pci-dev.o obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ obj-$(CONFIG_SND_SOC_SOF_XTENSA) += xtensa/
Signature · 1 line
2.20.1
Quoted 1 line · Jaroslav Kysela
Use the proper module name. The objs assignments are already there.
Good catch, I've been using these module names blindly in our test scripts without noticing this. Thanks for the correction
Quoted 25 lines
Signed-off-by Jaroslav Kysela <[email protected]>Cc Liam Girdwood <[email protected]>Cc Pierre-Louis Bossart <[email protected]>Cc Takashi Iwai <[email protected]>Cc Mark Brown <[email protected]>0--- sound/soc/sof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/sof/Makefile +2
-2@@ -11,8 +11,8 @@ obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o -obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o -obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o +obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi-dev.o +obj-$(CONFIG_SND_SOC_SOF_PCI) += snd-sof-pci-dev.o obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ obj-$(CONFIG_SND_SOC_SOF_XTENSA) += xtensa/
Mark Brown
maintainerQuoted 1 line · Jaroslav Kysela
Use the proper module name. The objs assignments are already there.
This breaks the build for me:
DESCEND objtool
CALL scripts/atomic/check-atomics.sh CALL scripts/checksyscalls.sh CHK include/generated/compile.h
make[3]: *** No rule to make target 'sound/soc/sof/snd-sof-acpi-dev.o', needed by 'sound/soc/sof/built-in.a'. Stop.
Jaroslav Kysela
maintainerDne 25. 07. 19 v 15:19 Mark Brown napsal(a):
Quoted 11 lines · Jaroslav Kysela
Quoted 1 line
Use the proper module name. The objs assignments are already there.
This breaks the build for me:
DESCEND objtool
CALL scripts/atomic/check-atomics.sh CALL scripts/checksyscalls.sh CHK include/generated/compile.hmake[3]: *** No rule to make target '
sound/soc/sof/snd-sof-acpi-dev.o', needed by 'sound/soc/sof/built-in.a'. Stop.
Oops. I sent the v2 of the patch.
Thanks,
Jaroslav
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.