aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAyan Kumar Halder2021-11-09 14:51:23 +0000
committerStefano Stabellini2021-11-09 13:11:28 -0800
commitc3ae3077b9489c105089592d59b146c456f5ed6b (patch)
tree05c70cb50e4cabe672e75a689b12af47a769af9c /scripts
parent99d452ee2e3c2f0abebbaaad32aa5ae1a58da0bd (diff)
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/uboot-script-gen8
1 files 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
}