| From ad08fd494bf00c03ae372e0bbd9cefa37bf608d6 Mon Sep 17 00:00:00 2001 |
| From: Steve Capper <steve.capper@linaro.org> |
| Date: Mon, 16 Mar 2015 09:30:39 +0000 |
| Subject: arm64: Adjust EFI libstub object include logic |
| |
| From: Steve Capper <steve.capper@linaro.org> |
| |
| commit ad08fd494bf00c03ae372e0bbd9cefa37bf608d6 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm64/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm64/Makefile |
| +++ b/arch/arm64/Makefile |
| @@ -48,7 +48,7 @@ core-$(CONFIG_KVM) += arch/arm64/kvm/ |
| core-$(CONFIG_XEN) += arch/arm64/xen/ |
| core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ |
| libs-y := arch/arm64/lib/ $(libs-y) |
| -libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ |
| +core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a |
| |
| # Default target when executing plain make |
| KBUILD_IMAGE := Image.gz |
