diff mbox

[Xen-devel,RFC,OSSTEST,19/19] Osstest/Debian: Workaround oddities in the u-boot script parser.

Message ID 1412942554-752-19-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Oct. 10, 2014, 12:02 p.m. UTC 
${filesize} is a bare hex number (i.e. no 0x prefix), but apparently 'fdt set'
needs the 0x prefix to make sense of it.

Furthermore it is confused by "0xABCD>" (and "ABCD>") and complains because ">"
isn't a valid digit. So put a space after the number.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/Debian.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Ian Jackson Oct. 10, 2014, 2:48 p.m. UTC | #1 
Ian Campbell writes ("[PATCH RFC OSSTEST 19/19] Osstest/Debian: Workaround oddities in the u-boot script parser."):
> ${filesize} is a bare hex number (i.e. no 0x prefix), but apparently
> 'fdt set' needs the 0x prefix to make sense of it.

WTF.

> Furthermore it is confused by "0xABCD>" (and "ABCD>") and complains
> because ">" isn't a valid digit. So put a space after the number.

Surely these are bugs, so can we have the ref to the upstream bug
tracker ?

Thanks,
Ian.
diff mbox

Patch

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 4539452..2fe4728 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -163,16 +163,16 @@  echo command line: \\\${bootargs}
 ext2load scsi 0 \\\${kernel_addr_r} $kern
 fdt mknod /chosen module\@0
 fdt set /chosen/module\@0 compatible "xen,linux-zimage" "xen,multiboot-module"
-fdt set /chosen/module\@0 reg <\\\${kernel_addr_r} \\\${filesize}>
-fdt set /chosen/module\@0 bootargs "$xenkopt ro root=$root"
-echo Loaded $kern to \\\${kernel_addr_r} (\\\${filesize})
+fdt set /chosen/module\@0 reg <\\\${kernel_addr_r} 0x\\\${filesize} >
+fdt set /chosen/module\@0 bootargs "$xenkopt ro root=$root clk_ignore_unused"
+echo Loaded $kern to \\\${kernel_addr_r} (0x\\\${filesize})
 echo command line: $xenkopt ro root=$root
 
 ext2load scsi 0 \\\${ramdisk_addr_r} $initrd
 fdt mknod /chosen module\@1
 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 set /chosen/module\@1 reg <\\\${ramdisk_addr_r} 0x\\\${filesize} >
+echo Loaded $initrd to \\\${ramdisk_addr_r} (0x\\\${filesize})
 
 fdt print /chosen