]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
uboot: make flask loading address host property
authorWei Liu <wei.liu2@citrix.com>
Tue, 24 Mar 2015 11:45:52 +0000 (11:45 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 31 Mar 2015 12:32:04 +0000 (13:32 +0100)
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: [ijc] Rebase over change to preceding patch

Osstest/Debian.pm

index c6cd9796ad54582c9baeec66eea20aa2950b62ea..69530fb506c265e09897eae9ba20fe4e12d1ccd2 100644 (file)
@@ -158,10 +158,16 @@ sub setupboot_uboot ($$$$) {
            # Use the flaskpolicy from tools build job because we might
            # want to test cross releases policy compatibility.
            my $flaskpolicy = get_runvar('flaskpolicy',$r{buildjob});
+           my $flask_policy_addr_r =
+               get_host_property($ho, 'UBootSetFlaskAddrR', undef);
+           my $set_flask_addr_r =
+               $flask_policy_addr_r ?
+               "setenv flask_policy_addr_r $flask_policy_addr_r" : "";
+
            $xenhopt .= " flask=enforcing";
            $flask_commands = <<END;
 
-setenv flask_policy_addr_r 0x1200000
+${set_flask_addr_r}
 flaskpolicy=$flaskpolicy
 ext2load scsi 0 \\\${flask_policy_addr_r} \$flaskpolicy
 fdt mknod /chosen module\@2