arm64: Adjust EFI libstub object include logic
authorSteve Capper <steve.capper@linaro.org>
Mon, 16 Mar 2015 09:30:39 +0000 (09:30 +0000)
committerWill Deacon <will.deacon@arm.com>
Tue, 17 Mar 2015 16:59:47 +0000 (16:59 +0000)
commitad08fd494bf00c03ae372e0bbd9cefa37bf608d6
tree2168f1de0e697319c750fc7a68002989f6f1b2ac
parent667f3fd3950c123fd62d3b15d9db80926e75f1f0
arm64: Adjust EFI libstub object include logic

Commit f4f75ad5 ("efi: efistub: Convert into static library")
introduced a static library for EFI stub, libstub.

The EFI libstub directory is referenced by the kernel build system via
a obj subdirectory rule in:
drivers/firmware/efi/Makefile

Unfortunately, arm64 also references the EFI libstub via:
libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/

If we're unlucky, the kernel build system can enter libstub via two
simultaneous threads resulting in build failures such as:

fixdep: error opening depfile: drivers/firmware/efi/libstub/.efi-stub-helper.o.d: No such file or directory
scripts/Makefile.build:257: recipe for target 'drivers/firmware/efi/libstub/efi-stub-helper.o' failed
make[1]: *** [drivers/firmware/efi/libstub/efi-stub-helper.o] Error 2
Makefile:939: recipe for target 'drivers/firmware/efi/libstub' failed
make: *** [drivers/firmware/efi/libstub] Error 2
make: *** Waiting for unfinished jobs....

This patch adjusts the arm64 Makefile to reference the compiled library
explicitly (as is currently done in x86), rather than the directory.

Fixes: f4f75ad5 efi: efistub: Convert into static library
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/Makefile