summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18558ca 656b803 f474c8c b426867 1d93ba2)
raw | combined (merge: 18558ca 656b803 f474c8c b426867 1d93ba2)
author | Russell King <rmk+kernel@arm.linux.org.uk> | |
Fri, 4 Mar 2016 23:36:02 +0000 (23:36 +0000) | ||
committer | Russell King <rmk+kernel@arm.linux.org.uk> | |
Fri, 4 Mar 2016 23:36:02 +0000 (23:36 +0000) |
1 | 2 | 3 | 4 | 5 | |||
---|---|---|---|---|---|---|---|
arch/arm/boot/compressed/Makefile | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | blob | history |
diff --cc arch/arm/boot/compressed/Makefile
index 7a6a58ef8aaf815728fd59b0ca7af752495595b0,4c23a68a0917049e4c7e9e864dcebca38d6b75b2,43788b1a1ac5e64372e1f3d3b012ba97a2e2d6ea,9541277b79529e2c2ef91d6b24e8f299045be873,3f9a9ebc77c389bbf794ee5a6840ceb0294b63f3..d50430c40045dd3e43fe37abf63f11a011e4c687
@@@@@@ -176,11 -167,11 -176,11 -164,11 -167,9 +173,11 @@@@@@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(C
false; \
fi
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
+efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a
+
--- $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
+++ +$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
- $(bswapsdi2) FORCE
+ $(bswapsdi2) $(efi-obj-y) FORCE
@$(check_for_multiple_zreladdr)
$(call if_changed,ld)
@$(check_for_bad_syms)