aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-23 16:56:37 +0000
committerMark Brown <broonie@kernel.org>2015-01-23 16:56:37 +0000
commit250e8659c56d94320b877f659be45b8de130fa31 (patch)
tree71095fcd0b70a869ffc2589ec72bf2334b0643a6 /arch/arm64/kernel/Makefile
parent7adf3d9a27e4838d0af9250c53ad5744b84886ce (diff)
parentc7aae4d46ea5c7fb51edd68839588967ef2a7536 (diff)
downloadlinux-linaro-stable-250e8659c56d94320b877f659be45b8de130fa31.tar.gz
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-efi' into linux-linaro-lsk-v3.14lsk-v3.14-15.01
Conflicts: arch/arm64/kernel/Makefile drivers/firmware/efi/efi-stub-helper.c
Diffstat (limited to 'arch/arm64/kernel/Makefile')
-rw-r--r--arch/arm64/kernel/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 6ae85d55308b..376e18e79b9a 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -4,6 +4,8 @@
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
+CFLAGS_efi-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) \
+ -I$(src)/../../../scripts/dtc/libfdt
CFLAGS_REMOVE_ftrace.o = -pg
CFLAGS_REMOVE_insn.o = -pg
@@ -28,6 +30,7 @@ arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND) += sleep.o suspend.o
arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o
arm64-obj-$(CONFIG_KGDB) += kgdb.o
+arm64-obj-$(CONFIG_EFI) += efi.o efi-stub.o efi-entry.o
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)