[Xen-changelog] [xen master] xen/arm: Remove build option CONFIG_LOAD_ADDRESS

[patchbot@xxxxxxx]

commit d0d0bc486c46fbf11b5e79d8868d32ce14eec2a7
Author:     Julien Grall <julien.grall@xxxxxxx>
AuthorDate: Fri Feb 3 19:20:46 2017 +0000
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Wed Feb 15 17:27:37 2017 -0800

    xen/arm: Remove build option CONFIG_LOAD_ADDRESS
    
    The build option CONFIG_LOAD_ADDRESS is defined but never plumbed
    through.
    
    Signed-off-by: Julien Grall <julien.gralL@xxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 config/arm32.mk        | 2 --
 config/arm64.mk        | 2 --
 xen/arch/arm/Makefile  | 2 +-
 xen/arch/arm/xen.lds.S | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/arm32.mk b/config/arm32.mk
index 001e214..f95228e 100644
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -12,6 +12,4 @@ CFLAGS += -marm
 # Use only if calling $(LD) directly.
 LDFLAGS_DIRECT += -EL
 
-CONFIG_LOAD_ADDRESS ?= 0x80000000
-
 IOEMU_CPU_ARCH ?= arm
diff --git a/config/arm64.mk b/config/arm64.mk
index 5a8e534..aa45772 100644
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -9,8 +9,6 @@ CFLAGS += #-marm -march= -mcpu= etc
 # Use only if calling $(LD) directly.
 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 7afb8a3..c849f6b 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -120,7 +120,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
        $(CC) $(filter-out -flto,$(CFLAGS)) -S -o $@ $<
 
 xen.lds: xen.lds.S
-       $(CC) -P -E -Ui386 $(AFLAGS) -DXEN_PHYS_START=$(CONFIG_LOAD_ADDRESS) -o 
$@ $<
+       $(CC) -P -E -Ui386 $(AFLAGS) -o $@ $<
        sed -e 's/xen\.lds\.o:/xen\.lds:/g' <.xen.lds.d >.xen.lds.d.new
        mv -f .xen.lds.d.new .xen.lds.d
 
diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index ddef595..94b7049 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -21,7 +21,7 @@ OUTPUT_ARCH(FORMAT)
 
 PHDRS
 {
-  text PT_LOAD /* XXX should be AT ( XEN_PHYS_START ) */ ;
+  text PT_LOAD ;
 #if defined(BUILD_ID)
   note PT_NOTE ;
 #endif
@@ -30,7 +30,7 @@ SECTIONS
 {
   . = XEN_VIRT_START;
   _start = .;
-  .text : /* XXX should be AT ( XEN_PHYS_START ) */ {
+  .text : {
         _stext = .;            /* Text section */
        *(.text)
        *(.text.cold)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog