Convert to new override syntax

Fix various overrides that have been missed in previous conversion.

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

10 files changed, 38 insertions, 38 deletions

diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 5f25600f..8697293d 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -20,12 +20,12 @@ FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 558cc85e..8603098e 100644
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -43,14 +43,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -68,5 +68,5 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 62c9bc04..054bff88 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -44,14 +44,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -70,4 +70,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 99dc140d..2b0cd495 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -50,9 +50,9 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
@@ -64,7 +64,7 @@ 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:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -83,4 +83,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${QEMU_HW_DTB_PMC} \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 39801e22..1996a36e 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -41,14 +41,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -67,4 +67,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 82d47cb4..224365fa 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -38,12 +38,12 @@ IMAGE_BOOT_FILES += " \
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index b5268689..3a182217 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -38,12 +38,12 @@ IMAGE_BOOT_FILES += " \
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 57570531..89c997f1 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -42,7 +42,7 @@ QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
                 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
                 ${@qemu_zynqmp_unhalt(d, True)} \
                 -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
@@ -51,9 +51,9 @@ QB_OPT_APPEND:append_qemuboot-xilinx = " \
                 "
 
 # Attach the rootfs disk image to the second SD interface of QEMU (which is SD0)
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 QB_PMU_OPT = " \
                 -M microblaze-fdt \
@@ -64,6 +64,6 @@ QB_PMU_OPT = " \
                 -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
                 -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
                 "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
 
 do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy"
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 8a8d8f24..b585b7bf 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -21,12 +21,12 @@ HDF_MACHINE = "zc702-zynq7"
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 6f33c199..581d190a 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -56,7 +56,7 @@ QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
                 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
                 ${@qemu_zynqmp_unhalt(d, True)} \
                 -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
@@ -65,9 +65,9 @@ QB_OPT_APPEND:append_qemuboot-xilinx = " \
                 "
 
 # Attach the rootfs disk image to the second SD interface of QEMU (which is SD0)
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 QB_PMU_OPT = " \
                 -M microblaze-fdt \
@@ -78,7 +78,7 @@ QB_PMU_OPT = " \
                 -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
                 -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
                 "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
 
 do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy"