| Message ID | 20190711030713.4447-1-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3c86889b0584be3e0243c22bf0901f12dfebac9a |
| Headers | show |
| Series | ARM: fix O= building with CONFIG_FPE_FASTFPE | expand |
Arnd, Olof, Please ignore this. I wanted to put this patch into Russell's patch tracker, but just sent it to a wrong ML. Masahiro Yamada On Thu, Jul 11, 2019 at 12:08 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > To use Fastfpe, a user is supposed to enable CONFIG_FPE_FASTFPE > and put downstream source files into arch/arm/fastfpe/. > > It is not working for O= build because $(wildcard arch/arm/fastfpe) > checks if it exists in $(objtree), not in $(srctree). > > Add the $(srctree)/ prefix to fix it. > > While I was here, I slightly refactored the code. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > KernelVersion: 5.2 > > arch/arm/Makefile | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index f863c6935d0e..792f7fa16a24 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -271,14 +271,9 @@ endif > > export TEXT_OFFSET GZFLAGS MMUEXT > > -# Do we have FASTFPE? > -FASTFPE :=arch/arm/fastfpe > -ifeq ($(FASTFPE),$(wildcard $(FASTFPE))) > -FASTFPE_OBJ :=$(FASTFPE)/ > -endif > - > core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ > -core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) > +# Put arch/arm/fastfpe/ to use this. > +core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/)) > core-$(CONFIG_VFP) += arch/arm/vfp/ > core-$(CONFIG_XEN) += arch/arm/xen/ > core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ > -- > 2.17.1 >
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f863c6935d0e..792f7fa16a24 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -271,14 +271,9 @@ endif export TEXT_OFFSET GZFLAGS MMUEXT -# Do we have FASTFPE? -FASTFPE :=arch/arm/fastfpe -ifeq ($(FASTFPE),$(wildcard $(FASTFPE))) -FASTFPE_OBJ :=$(FASTFPE)/ -endif - core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ -core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) +# Put arch/arm/fastfpe/ to use this. +core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/)) core-$(CONFIG_VFP) += arch/arm/vfp/ core-$(CONFIG_XEN) += arch/arm/xen/ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
To use Fastfpe, a user is supposed to enable CONFIG_FPE_FASTFPE and put downstream source files into arch/arm/fastfpe/. It is not working for O= build because $(wildcard arch/arm/fastfpe) checks if it exists in $(objtree), not in $(srctree). Add the $(srctree)/ prefix to fix it. While I was here, I slightly refactored the code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- KernelVersion: 5.2 arch/arm/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)