[Xen-devel] [PATCH] xen: arm: make zImage the default target which we install

[Ian Campbell <ijc@xxxxxxxxxxxxxx>]

From: Ian Campbell <ian.campbell@xxxxxxxxxx>

The zImage compatible binary is the useful one on real hardware. The relocated
ELF thing is only really useful when booting directly on Fast Models. The
customary suffix for that case is .axf so provide that as a target.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Wookey <wookey@xxxxxxxxxx>
---
 xen/arch/arm/Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 87fabe1..0fba75c 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -40,20 +40,15 @@ endif
 
 ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
 
-$(TARGET): $(TARGET)-syms $(TARGET).bin
+$(TARGET): $(TARGET)-syms $(TARGET).axf
+       $(OBJCOPY) -O binary -S $< $@
+
+$(TARGET).axf: $(TARGET)-syms
        # XXX: VE model loads by VMA so instead of
        # making a proper ELF we link with LMA == VMA and adjust crudely
        $(OBJCOPY) --change-addresses +0x80000000 $< $@
        $(STRIP) $@
 
-#
-$(TARGET).bin: $(TARGET)-syms
-       $(OBJCOPY) -O binary -S $< $@
-
-#$(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32
-#      ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \
-#      `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'`
-
 ifeq ($(lto),y)
 # Gather all LTO objects together
 prelink_lto.o: $(ALL_OBJS)
-- 
1.8.3.2


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel