1 files changed, 7 insertions, 4 deletions

diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index daa73f2a..d0b95cac 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -34,7 +34,7 @@ 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"
+SERIAL_CONSOLES ?= "115200;ttyPS1 115200;ttyPS0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 # Required generic machine inclusion
@@ -58,9 +58,12 @@ QB_MEM = "-m 2G"
 # Ultra96 board uses ultra96-arm.dtb as QEMU HW PS DTB.
 QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/ultra96-arm.dtb"
 
-# 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"
+# Both psu_uart_0 and psu_uart_1 are defined, but 1 is the primary uart.
+#
+# hw ps7_uart_0 (0xFF000000) - linux serial1 (ttyPS1)
+# hw ps7_uart_1 (0xFF010000) - linux serial0 (ttyPS0)
+# ? dcc / axi_uart16550_0 ?  - linux serial2
+QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
 
 # 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.