ultra96-zynqmp: Fix serial issue for qemu boot

runqemu assumes psu_uart_0 is used but in Ultra96 psu_uart_1 is the
primary uart device, So set psu_uart_0 as null to fix qemu boot
issue.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index 49fd8ba9..0da0476c 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -36,6 +36,8 @@ UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # ultra96-zynqmp Serial Console
+# In Ultra96 uart1 is the primary uart device but DTG set the serial0 alias
+# to uart1, hence we are using ttyPS0 for Ultra96.
 SERIAL_CONSOLES ?= "115200;ttyPS0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
@@ -49,9 +51,14 @@ require conf/machine/zynqmp-eg-generic.conf
 # from local.conf.
 HDF_MACHINE = "ultra96-zynqmp"
 
-# Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G, Hence set to 2G
+# Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G,
+# Hence set QB_MEM to 2GB.
 QB_MEM = "-m 2G"
 
+# runqemu assumes psu_uart_0 is used but in Ultra96 psu_uart_1 is the primary
+# uart device, So set psu_uart_0 as null.
+QB_OPT_APPEND += " -serial null"
+
 # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match
 # the xsa. User can enable explicitly if required from local.conf.
 # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"