Osstest/Debian: Remove hardcoded addresses from boot.scr

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@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 2ea1a7e24bd1b42a58663977ee7c97ab92616e59..146fa94719a3f5d2d7a3eaed63a60206373af417 100644 (file)
--- 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})