From c3ae3077b9489c105089592d59b146c456f5ed6b Mon Sep 17 00:00:00 2001
From: Ayan Kumar Halder
Date: Tue, 9 Nov 2021 14:51:23 +0000
Subject: Moved the default assignment of domU bootargs

The default assignment of domU bootargs has been moved from
add_device_tree_kernel() to xen_config(). This is done to mantain
consistency with other DomU defaults.

Reported-by: Brian Woods <brian.woods@xilinx.com>
Signed-off-by: Ayan Kumar Halder <ayankuma@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
 scripts/uboot-script-gen | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index 6ae767e..66bcad7 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -87,10 +87,6 @@ function add_device_tree_kernel()
     local size=$3
     local bootargs=$4
 
-    if test -z "$bootargs"
-    then
-        bootargs="console=ttyAMA0"
-    fi
     dt_mknode "$path" "module$addr"
     dt_set "$path/module$addr" "compatible" "str_a" "multiboot,kernel multiboot,module"
     dt_set "$path/module$addr" "reg" "hex"  "0x0 $addr 0x0 $(printf "0x%x" $size)"
@@ -351,6 +347,10 @@ function xen_config()
         then
             DOMU_VCPUS[$i]=1
         fi
+        if test -z "${DOMU_CMD[$i]}"
+        then
+            DOMU_CMD[$i]="console=ttyAMA0"
+        fi
         i=$(( $i + 1 ))
     done
 }
-- 
cgit v1.2.3