[Xen-devel] xen/arm: Remove the makefile target xen.axf

Message ID 1486149673-20646-1-git-send-email-julien.grall@arm.com
State New
Headers show

Commit Message

Julien Grall Feb. 3, 2017, 7:21 p.m.
Since commit 4557c22 "xen: arm: rewrite start of day page table and cpu
bring up", Xen requires to be launched in NS HYP/EL2.

xen.axf is generated in order to directly boot Xen on ARM models (e.g
Foundation). However they usually start in secure mode, which mean Xen
cannot boot.

The way forward to boot Xen on models is using either EFI or
bootwrapper [1].

[1] https://git.kernel.org/cgit/linux/kernel/git/mark/boot-wrapper-aarch64.git/

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Stefano Stabellini Feb. 16, 2017, 1:30 a.m. | #1
On Fri, 3 Feb 2017, Julien Grall wrote:
> Since commit 4557c22 "xen: arm: rewrite start of day page table and cpu
> bring up", Xen requires to be launched in NS HYP/EL2.
> 
> xen.axf is generated in order to directly boot Xen on ARM models (e.g
> Foundation). However they usually start in secure mode, which mean Xen
> cannot boot.
> 
> The way forward to boot Xen on models is using either EFI or
> bootwrapper [1].
> 
> [1] https://git.kernel.org/cgit/linux/kernel/git/mark/boot-wrapper-aarch64.git/
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  xen/arch/arm/Makefile | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
> index 7afb8a3..91cb3f3 100644
> --- a/xen/arch/arm/Makefile
> +++ b/xen/arch/arm/Makefile
> @@ -70,18 +70,12 @@ else
>  all_symbols =
>  endif
>  
> -$(TARGET): $(TARGET)-syms $(TARGET).axf
> +$(TARGET): $(TARGET)-syms
>  	$(OBJCOPY) -O binary -S $< $@
>  ifeq ($(CONFIG_ARM_64),y)
>  	ln -sf $(notdir $@)  ../../$(notdir $@).efi
>  endif
>  
> -$(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) $@
> -
>  ifeq ($(CONFIG_LTO),y)
>  # Gather all LTO objects together
>  prelink_lto.o: $(ALL_OBJS)
> @@ -130,5 +124,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
>  	rm -f $(TARGET).efi
> -- 
> 1.9.1
>

Patch

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 7afb8a3..91cb3f3 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -70,18 +70,12 @@  else
 all_symbols =
 endif
 
-$(TARGET): $(TARGET)-syms $(TARGET).axf
+$(TARGET): $(TARGET)-syms
 	$(OBJCOPY) -O binary -S $< $@
 ifeq ($(CONFIG_ARM_64),y)
 	ln -sf $(notdir $@)  ../../$(notdir $@).efi
 endif
 
-$(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) $@
-
 ifeq ($(CONFIG_LTO),y)
 # Gather all LTO objects together
 prelink_lto.o: $(ALL_OBJS)
@@ -130,5 +124,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
 	rm -f $(TARGET).efi