various machines: Change qemu serial port configuration for nanbield

As of Yocto Project nanbield, if a -serial is pass in QB_OPT_APPEND the
runqemu may add additional null entries (padding) or simply skip further
setup.

Due to this, emulated platforms where the first hardware serial port
is not used in Linux need specific "-serial null" settings, but with
the new rules also need the real serial port defined (this can no
longer be assumed.)

The downside of this new approach is all consoles must be defined, so
we can not rely on runqemu adding "-serial mon:<device>", as now
assume the primary usage is stdio (nographic/serial port) settings.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 10 insertions, 2 deletions

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 \