From 841a9b66cb3943a42257b2b29d57f3f031c34323 Mon Sep 17 00:00:00 2001 From: Brian Woods Date: Mon, 7 Oct 2019 18:25:54 -0700 Subject: Adjust uboot-script-gen for Xilinx Xen dtbs The "fdt set /chosen/dom0 bootargs" command does not work. Since Xilinx's dtb for Xen aleady has /chosen/xen,dom0-bootargs and that is used, switch out the fields used for dom0's kernel cmdline. Signed-off-by: Brian Woods Reviewed-by: Stefano Stabellini --- docker-extras/uboot-script-gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker-extras/uboot-script-gen') diff --git a/docker-extras/uboot-script-gen b/docker-extras/uboot-script-gen index ac9b8b6..e72f73e 100644 --- a/docker-extras/uboot-script-gen +++ b/docker-extras/uboot-script-gen @@ -51,7 +51,7 @@ function device_tree_editing() echo "fdt set /chosen/dom0 reg <0x0 "$dom0_kernel_addr" 0x0 "$dom0_kernel_size">" >> $UBOOT_SOURCE if test "$LOAD_CMD" = "tftpb" then - echo "fdt set /chosen/dom0 bootargs \"console=hvc0 earlycon=xen earlyprintk=xen root=/dev/ram0\"" >> $UBOOT_SOURCE + echo "fdt set /chosen xen,dom0-bootargs \"console=hvc0 earlycon=xen earlyprintk=xen root=/dev/ram0\"" >> $UBOOT_SOURCE if test $dom0_ramdisk_addr != "-" then echo "fdt mknod /chosen dom0-ramdisk" >> $UBOOT_SOURCE @@ -59,7 +59,7 @@ function device_tree_editing() echo "fdt set /chosen/dom0-ramdisk reg <0x0 "$dom0_ramdisk_addr" 0x0 "$dom0_ramdisk_size">" >> $UBOOT_SOURCE fi else - echo "fdt set /chosen/dom0 bootargs \"console=hvc0 earlycon=xen earlyprintk=xen root=/dev/sda2\"" >> $UBOOT_SOURCE + echo "fdt set /chosen xen,dom0-bootargs \"console=hvc0 earlycon=xen earlyprintk=xen root=/dev/sda2\"" >> $UBOOT_SOURCE fi i=0 -- cgit v1.2.3