[XenPPC] [xenppc-unstable] [ppc] Allow for the xen link address to be overridden

[Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 24b15d746dd2befd97c33139406845f7f82bd374
# Parent  279ada76581b4c14f0397577d6122c4e33b35b40
[ppc] Allow for the xen link address to be overridden

Xen's current link address of 0x2000000 causes a program exception on
JS20 blades with SLOF.  This patch changes the default link address
to 0x3000000 (50MB) and adds some logic to allow LINK=X to be supplied
at the make invocation.

This works for the JS20 and JS21 blades with SLOF that I have access to.
Hopefully it works on Maple-D as well.

Signed-off-by: Amos Waterland <apw@xxxxxxxxxx>

It does work for Maple-D/PIBS

Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
---
 xen/arch/ppc/Makefile |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff -r 279ada76581b -r 24b15d746dd2 xen/arch/ppc/Makefile
--- a/xen/arch/ppc/Makefile     Tue Jun 20 13:53:04 2006 -0400
+++ b/xen/arch/ppc/Makefile     Tue Jun 20 18:00:08 2006 -0400
@@ -46,6 +46,11 @@ CFLAGS += -Wmissing-prototypes -Wmissing
 CFLAGS += -Wmissing-prototypes -Wmissing-declarations -Wpacked
 CFLAGS += -Wredundant-decls
 
+LINK=0x3000000
+boot32_link_base = $(LINK)
+xen_link_offset  = 100
+xen_link_base    = $(patsubst %000,%$(xen_link_offset),$(LINK))
+
 #
 # The following flags are fed to gcc in order to link several
 # objects into a single ELF segment and to not link in any additional
@@ -79,7 +84,7 @@ start.o: boot/start.S
        $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
 
 $(TARGET)-syms: start.o $(ALL_OBJS) xen.lds
-       $(CC) $(CFLAGS) $(OMAGIC) -Wl,-Ttext,0x2000100,-T,xen.lds start.o 
$(ALL_OBJS) -o $@
+       $(CC) $(CFLAGS) $(OMAGIC) -Wl,-Ttext,$(xen_link_base),-T,xen.lds 
start.o $(ALL_OBJS) -o $@
 
 $(TARGET).bin: $(TARGET)-syms
        $(CROSS_COMPILE)objcopy --output-target=binary $< $@
@@ -95,7 +100,7 @@ boot32.o: boot/boot32.S
 
 $(TARGET): boot32.o $(TARGET).bin.o
        $(CC) -m32 -N -Wl,-melf32ppclinux -static -nostdlib \
-               -Wl,-Ttext,0x2000000  -Wl,-Tdata,0x2000100 \
+               -Wl,-Ttext,$(boot32_link_base)  -Wl,-Tdata,$(xen_link_base) \
                $(CFLAGS) $^ -o $@
 
 asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(HDRS)

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel