7 files changed, 65 insertions, 11 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index 1c651816..c450b542 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -13,3 +13,13 @@ EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sys
 
 # Use the xilinx specific version for these users
 IMAGE_CLASSES += "qemuboot-xilinx"
+
+# As of Yocto Project nanbield, if a -serial is pass in QB_OPT_APPEND the
+# runqemu may add additional null entries or simply skip further setup.
+#
+# To help us be able to adjust for this behavior add a special
+# QB_XILINX_SERIAL that will allow us to define serial ports for qemu
+# emulated boards that may not match the standard Linux behavior.
+#
+QB_XILINX_SERIAL ?= ""
+QB_OPT_APPEND += "${QB_XILINX_SERIAL}"
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 5bf87344..8fb40070 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -91,9 +91,16 @@ IMAGE_FSTYPES += "cpio.gz"
 # Microblaze QEMU Configurations
 QB_MEM = "-m 2G"
 QB_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
-QB_OPT_APPEND = ""
 QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
+# This will work with the default runqemu, as the first serial port is the
+# correct console
+#
+# One total serial port defined in this model (according to the generated dts)
+#
+# hw serial0 axi_uartlite_0 (40600000) - linux serial0 (ttyUL0)
+QB_XILINX_SERIAL = ""
+
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 9fab8875..5ee09599 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -89,9 +89,17 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.dtb"
 QEMU_HW_DTB_PS_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-ps-virt.dtb"
 QEMU_HW_DTB_PMC_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-pmc-virt.dtb"
 
-QB_OPT_APPEND = " \
+# Four total serial ports defined in this model (according to the dts)
+#
+# hw serial0 xps-uartlite (f0110000)       - 
+# hw serial1 ddrmc/xps-uartlite (f0310000) - 
+# hw serial2 pl011 (ff000000)              - linux serial0 (ttyAMA0)
+# hw serial3 pl011 (ff010000)              - linux serial1 (ttyAMA1) (disabled)
+# ? dcc ?                                  - linux serial2 (????)
+QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+
+QB_OPT_APPEND += " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
-    -serial null -serial null  \
     ${@qemu_add_extra_args(d)} \
     "
 
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index e1f222e2..9945d301 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -19,6 +19,10 @@ YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}"
 YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
 YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
 
+# Versal Serial Console
+SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 require conf/machine/versal-generic.conf
 
 SOC_VARIANT = "net"
@@ -31,6 +35,14 @@ HDF_MACHINE = "versal-net-generic"
 QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
 QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 
+# Four total serial ports defined in this model (according to the dts)
+#
+# hw serial0 xps-uartlite (0xf0110000) -
+# hw serial1 xps-uartlite (0xf0310000) - 
+# hw serial2 pl011 (0xf1920000)        - linux serial0 (ttyAMA0)
+# hw serial3 pl011 (0xf1930000)        - linux serial1 (ttyAMA1)
+QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_net_generic']['versal-net-generic' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 673dad68..3dea2012 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -75,9 +75,17 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
 QB_KERNEL_ROOT = "/dev/mmcblk0p2"
 
+# Side effect of not-enabled serial port is we have to lock
+# the second (console) to mon:stdio.
+#
+# Two total serial ports defined in this model (according to the generated dts)
+#
+# hw uart0 xuartps (e0000000) -
+# hw uart1 xuartps (e0001000) - linux serial0 (ttyPS0)
+QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
+
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
-QB_OPT_APPEND = " \
-        -serial null \
+QB_OPT_APPEND += " \
         -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \
         -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \
         -device loader,addr=0xf800012c,data=0x1ed044d,data-len=4 \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index b1365e5f..40ad6006 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -43,7 +43,7 @@ UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # ZynqMP Serial Console
-SERIAL_CONSOLES ?= "115200;ttyPS0"
+SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-zynqmp.inc
@@ -99,6 +99,12 @@ QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
 QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 
+# Two total serial ports defined in this model (according to the dts)
+#
+# hw ps7_uart_0 (0xFF000000) - linux serial1 (ttyPS1)
+# hw ps7_uart_1 (0xFF010000) - linux serial0 (ttyPS0)
+QB_XILINX_SERIAL = "-serial mon:stdio -serial null"
+
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 #
 # In an actual device the FSBL will run first, load ATF and setup the
@@ -124,7 +130,7 @@ QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 # 00000000fffc0000: 0x584e4c58 0x00000001 0x08000000 0x00000000
 # 00000000fffc0010: 0x00000010 0x00000000
 #
-QB_OPT_APPEND = " \
+QB_OPT_APPEND += " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     ${@qemu_zynqmp_unhalt(d, True)} \
     -device loader,addr=0xfffc0000,data=0x584c4e5801000000,data-be=true,data-len=8 \
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.