manual changes for overrides syntax fixes

Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

29 files changed, 33 insertions, 33 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
index d6cfd376..c2093ca6 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
@@ -41,7 +41,7 @@ def qemu_target_binary(d):
         ta = "aarch64"
     return "qemu-system-%s" % ta
 
-def qemu:zynqmp_unhalt(d, multiarch):
+def qemu_zynqmp_unhalt(d, multiarch):
     if multiarch:
         return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true"
     return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4"
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 3f9d598a..eac1b3dc 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -9,7 +9,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost"
 
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index ec7a0fe3..db9c20bd 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index f637f1ed..6741e2f3 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
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 a7817c10..558cc85e 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
@@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core"
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index 5c02d023..1bda4cd1 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index abf73a61..62c9bc04 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core"
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index a2407d8b..97fb9cc7 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index af7a042e..f6c158df 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 794506e7..39801e22 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index e10008a7..d91d2ba3 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index fb709b78..82d47cb4 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 369d5d75..b5268689 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 2b0ba1a9..57570531 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 # Default SD image build onfiguration, use qemu-sd to pad
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 6f72250f..e6fa0b3f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 180562f0..25bfd3a8 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -9,7 +9,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 6ea024f8..cbe0a627 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 4c730d3f..672411ea 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 98a580ed..c23c8ca5 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 54a27a9d..92096220 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 2e8e5071..3ebb9897 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 09309045..a824de2c 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -12,7 +12,7 @@ require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index 7d6482bd..137796c6 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLES ?= "115200;ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 FORCE_PLATFORM_INIT = "1"
 UBOOT_ELF = "u-boot"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 39ae6050..c09cf519 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index d6bb5a9c..8a8d8f24 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
 
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
 
-UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
 
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 3a1f1638..6f33c199 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -18,7 +18,7 @@ MACHINE_FEATURES += " usbgadget wifi bluetooth"
 
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
 
-UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 # Default SD image build onfiguration, use qemu-sd to pad
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index c46ae2fe..532da106 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -58,7 +58,7 @@ def create_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
 
     return
 
-def create:versal_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
+def create_versal_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
     import re, os
     id_dict = {}
     for cfg in config:
@@ -104,7 +104,7 @@ python do_configure() {
     fp = d.getVar("BIF_FILE_PATH")
     if fp == (d.getVar('B') + '/bootgen.bif'):
         arch = d.getVar("SOC_FAMILY")
-        biffunc = {'versal':create:versal_bif, 'zynq':create_bif, 'zynqmp':create_bif}
+        biffunc = {'versal':create_versal_bif, 'zynq':create_bif, 'zynqmp':create_bif}
         biffd = open(fp, 'w')
         biffd.write("the_ROM_image:\n")
         biffd.write("{\n")
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
index 512ae8e9..c7051bc4 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b
 
 # u-boot-xlnx has support for these
 HAS_PLATFORM_INIT ?= " \
-                xilinx:zynqmp_virt_config \
-                xilinx:zynq_virt_defconfig \
-                xilinx:versal_vc_p_a2197_revA_x_prc_01_revA \
+                xilinx_zynqmp_virt_config \
+                xilinx_zynq_virt_defconfig \
+                xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \
                 "
 
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index ebcf2551..a75484a8 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
@@ -167,8 +167,8 @@ do_configure[noexec] = "1"
 do_install[noexec] = "1"
 
 def append_baseaddr(d,offset):
-    skip:append = d.getVar('SKIP_APPEND_BASEADDR') or ""
-    if skip:append == "1":
+    skip_append = d.getVar('SKIP_APPEND_BASEADDR') or ""
+    if skip_append == "1":
         return offset
     import subprocess
     baseaddr = d.getVar('DDR_BASEADDR') or "0x0"