[PATCH OSSTEST] arm boot fixes and improvements

[Ian Campbell <ian.campbell@citrix.com>]

Correct prototype for setupboot_uboot.

Add some additional logging to the u-boot script creation process as well as
the resulting script, to aid debugging
---
 Osstest/Debian.pm |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 517fa61..c675e0d 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -120,11 +120,12 @@ sub lvm_lv_name($$) {
     return "/dev/mapper/$vg-$lv";
 }
 
-sub setupboot_uboot ($$$$) {
+sub setupboot_uboot ($$$) {
     my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
     my $bl= { };
 
     $bl->{UpdateConfig}= sub {
+	my ( $ho ) = @_;
 
 	my $xen = "xen";
 	my $kern = "vmlinuz-$want_kernver";
@@ -132,6 +133,9 @@ sub setupboot_uboot ($$$$) {
 
 	my $root= lvm_lv_name($ho,"root");
 
+	logm("Xen options: $xenhopt");
+	logm("Linux options: $xenkopt");
+
 	target_cmd_root($ho, <<END);
 if test ! -f /boot/$kern ; then
     exit 1
@@ -160,7 +164,7 @@ setenv xen_addr_r 0x01000000
 ext2load scsi 0 \\\${xen_addr_r} \$xen
 setenv bootargs "$xenhopt"
 echo Loaded \$xen to \\\${xen_addr_r} (\\\${filesize})
-echo command line: $xenhopt
+echo command line: \\\${bootargs}
 
 ext2load scsi 0 \\\${kernel_addr_r} $kern
 fdt mknod /chosen module\@0
@@ -176,6 +180,8 @@ fdt set /chosen/module\@1 compatible "xen,linux-initrd" "xen,multiboot-module"
 fdt set /chosen/module\@1 reg <\\\${ramdisk_addr_r} \\\${filesize}>
 echo Loaded $initrd to \\\${ramdisk_addr_r} (\\\${filesize})
 
+fdt print /chosen
+
 echo Booting \\\${xen_addr_r} - \\\${fdt_addr}
 bootz \\\${xen_addr_r} - \\\${fdt_addr}
 EOF
-- 
1.7.10.4