Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c86889b authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King
Browse files

ARM: 8876/1: fix O= building with CONFIG_FPE_FASTFPE 



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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent a05b9608

arch/arm/Makefile

+2 −7
Original line number Original line Diff line number Diff line
@@ -270,14 +270,9 @@ endif 




export	TEXT_OFFSET GZFLAGS MMUEXT

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_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_VFP)		+= arch/arm/vfp/

core-$(CONFIG_XEN)		+= arch/arm/xen/

core-$(CONFIG_XEN)		+= arch/arm/xen/

core-$(CONFIG_KVM_ARM_HOST) 	+= arch/arm/kvm/

core-$(CONFIG_KVM_ARM_HOST) 	+= arch/arm/kvm/