arm64: create xen.efi binary for arm64

The 'xen' binary for arm64 is both an Image file and a PE/COFF executable,
copy it to xen.efi so that the 'make install' processing is shared with
x86. Prior to this 'make install' was broken on arm64.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/arm64.mk b/config/arm64.mk
index 4e57b3a3cb4f1e48fe3c06ae3874533e85e2f2a4..6eafda2faca64e4ed7e5c0354edab964fa82eb0c 100644 (file)
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -15,3 +15,5 @@ LDFLAGS_DIRECT += -EL
 CONFIG_LOAD_ADDRESS ?= 0x80000000
 
 IOEMU_CPU_ARCH ?= aarch64
+
+EFI_DIR ?= /usr/lib64/efi

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index f330302871a8b91f7119d12f167c2a53f511c7b7..9a25290a0871a91d5992252119cc0bd3f8ca0b25 100644 (file)
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -49,6 +49,9 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
 
 $(TARGET): $(TARGET)-syms $(TARGET).axf
        $(OBJCOPY) -O binary -S $< $@
+ifeq (arm64,$(XEN_TARGET_ARCH))
+       ln -sf $(notdir $@)  ../../$(notdir $@).efi
+endif
 
 $(TARGET).axf: $(TARGET)-syms
        # XXX: VE model loads by VMA so instead of
@@ -100,3 +103,4 @@ clean::
        rm -f asm-offsets.s xen.lds
        rm -f $(BASEDIR)/.xen-syms.[0-9]*
        rm -f $(TARGET).axf
+       rm -f $(TARGET).efi