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@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>

diff --git a/config/arm32.mk b/config/arm32.mk
index 001e214b52471f45ac59d563d0cf345d8c5dcf90..f95228e3c079aa9f4b001a4f1043f8722d17af0a 100644 (file)
--- 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 5a8e534b6ba68ee2f40965efe8141aeba115e2a2..aa45772b6173fade1f0cf14e77012a6d9bfdbe50 100644 (file)
--- 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 7afb8a3b96ab088bc270e18269966aa0d1dca571..c849f6bc8a0efb788778f9d523289a133ab51316 100644 (file)
--- 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 ddef59537be0cc364c59f6fc25335745fea6d743..94b70499e05b9f0976a99f8756b2635f74deaef2 100644 (file)
--- 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)