[Xen-devel] [PATCH OSSTEST v5 08/14] Osstest/Debian: Remove hardcoded addresses from boot.scr

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

Those are specific to the midway platform.

This depends on a change to the hostdb to add "0x01000000" as the
value of a new UBootSetXenAddrR property of the midway machines.

Most platforms will need something similar. For both cubietruck and
arndale 0x41000000.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

---
v3: Move the property to a specific one like I was supposed to last
    time
v2: s/go along with/depends on/
---
 Osstest/Debian.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 2ea1a7e..146fa94 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -158,9 +158,13 @@ sub setupboot_uboot ($$$) {
        logm("Linux options: $xenkopt");
 
        my $early_commands = get_host_property($ho, 'UBootScriptEarlyCommands', 
'');
+       my $xen_addr_r = get_host_property($ho, 'UBootSetXenAddrR', undef);
 
        my $load_dtb = uboot_scr_load_dtb();
 
+       my $set_xen_addr_r =
+           $xen_addr_r ? "setenv xen_addr_r $xen_addr_r" : "";
+
        target_cmd_root($ho, <<END);
 if test ! -f /boot/$kern ; then
     exit 1
@@ -178,14 +182,11 @@ fdt addr \\\${fdt_addr}
 fdt resize
 
 ${early_commands}
+${set_xen_addr_r}
 
 fdt set /chosen \\\#address-cells <1>
 fdt set /chosen \\\#size-cells <1>
 
-setenv xen_addr_r 0x01000000
-#   kernel_addr_r=0x02000000
-#  ramdisk_addr_r=0x04000000
-
 ext2load scsi 0 \\\${xen_addr_r} \$xen
 setenv bootargs "$xenhopt"
 echo Loaded \$xen to \\\${xen_addr_r} (\\\${filesize})
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel