| Message ID | 20190725110808.19938-1-perex@perex.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: SOF: Makefile - fix the top-level kernel module names (add snd- prefix) | expand |
On 7/25/19 6:08 AM, Jaroslav Kysela wrote: > 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 > Signed-off-by: Jaroslav Kysela <perex@perex.cz> > Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: Mark Brown <broonie@kernel.org>0 > --- > sound/soc/sof/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile > index 8f14c9d2950b..d2f7a1bc09a1 100644 > --- a/sound/soc/sof/Makefile > +++ b/sound/soc/sof/Makefile > @@ -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/ >
On Thu, Jul 25, 2019 at 01:08:08PM +0200, Jaroslav Kysela wrote:
> 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.
Dne 25. 07. 19 v 15:19 Mark Brown napsal(a): > On Thu, Jul 25, 2019 at 01:08:08PM +0200, Jaroslav Kysela wrote: >> 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. > Oops. I sent the v2 of the patch. Thanks, Jaroslav
diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile index 8f14c9d2950b..d2f7a1bc09a1 100644 --- a/sound/soc/sof/Makefile +++ b/sound/soc/sof/Makefile @@ -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/
Use the proper module name. The objs assignments are already there. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Takashi Iwai <tiwai@suse.de> Cc: Mark Brown <broonie@kernel.org>0 --- sound/soc/sof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)