meta-xilinx-core: machines: Rename QB_XILINX_SERIAL to QEMU_HW_SERIAL

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

6 files changed, 8 insertions, 8 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 e75f556b..84856ef6 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -18,8 +18,8 @@ IMAGE_CLASSES += "qemuboot-xilinx"
 # 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
+# QEMU_HW_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} -nodefaults"
+QEMU_HW_SERIAL ??= ""
+QB_OPT_APPEND += "${QEMU_HW_SERIAL} -nodefaults"
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index deb00d29..e354eef6 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -66,7 +66,7 @@ QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 # 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 ?= ""
+QEMU_HW_SERIAL ?= ""
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index de900af0..af34ce4e 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -66,7 +66,7 @@ QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # 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"
+QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QB_OSPI_FILE ??= ""
 
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index eef3e8d5..eee867a7 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -65,7 +65,7 @@ QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # 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"
+QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QB_OSPI_FILE ??= ""
 
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 9355d6d2..8ce9d5af 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -58,7 +58,7 @@ QB_KERNEL_ROOT ?= "/dev/mmcblk0p2"
 #
 # hw uart0 xuartps (e0000000) -
 # hw uart1 xuartps (e0001000) - linux serial0 (ttyPS0)
-QB_XILINX_SERIAL ?= "-serial null -serial mon:stdio"
+QEMU_HW_SERIAL ?= "-serial null -serial mon:stdio"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 1be1789f..16f4723f 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -75,7 +75,7 @@ QEMU_HW_DTB_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 # hw ps7_uart_1 (0xFF010000) - linux serial0 (ttyPS0)
 #
 # Default configuration will evaluate to:
-#QB_XILINX_SERIAL = "-serial mon:stdio -serial null"
+#QEMU_HW_SERIAL = "-serial mon:stdio -serial null"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 #