From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH RFC OSSTEST 19/19] Osstest/Debian: Workaround oddities in the u-boot script parser. Date: Fri, 10 Oct 2014 13:02:34 +0100 Message-ID: <1412942554-752-19-git-send-email-ian.campbell@citrix.com> References: <1412942404.27111.12.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1412942404.27111.12.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org ${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 --- Osstest/Debian.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 -- 2.1.0