From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] xen: arm: make zImage the default target which we install Date: Thu, 18 Jul 2013 13:10:41 +0100 Message-ID: <1374149441.26728.73.camel@kazak.uk.xensource.com> References: <1373630398-20993-1-git-send-email-ijc@hellion.org.uk> <51E7DA0E.2070900@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <51E7DA0E.2070900@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Julien Grall Cc: julien.grall@citrix.com, Wookey , stefano.stabellini@eu.citrix.com, tim@xen.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Thu, 2013-07-18 at 13:05 +0100, Julien Grall wrote: > On 07/12/2013 12:59 PM, Ian Campbell wrote: > > From: Ian Campbell > > > > 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 > > Cc: Wookey > > --- > > 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) > > > > Is it possible to remove xen.axf when "make clean" is called? Sure. 8<-------------------------------------------- >>From 2c805196a0a4cfdac3ce185d04336cca11357d63 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jul 2013 12:54:42 +0100 Subject: [PATCH] xen: arm: make zImage the default target which we install 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 Cc: Wookey --- v2: Remove $(TARGET).axf on clean --- xen/arch/arm/Makefile | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 87fabe1..5ae5831 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) @@ -97,3 +92,4 @@ dtb.o: $(CONFIG_DTB_FILE) clean:: rm -f asm-offsets.s xen.lds rm -f $(BASEDIR)/.xen-syms.[0-9]* + rm -f $(TARGET).axf -- 1.7.2.5