u-boot-xlnx:Update UBOOT-MACHINE to xilinx_zynqmp_virt_defconfig for all zynqmp machines

Update UBOOT MACHINE defconfig to xilinx_zynqmp_virt_defconfig instead of using
custom machine specifc defconfigs.

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

10 files changed, 10 insertions, 19 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index 3f47a193..d118b144 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu100_revC_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index a640934b..dfb64868 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE ?= "xilinx_zynqmp_p_a2197_00_revA_defconfig"
+UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index 6bd868a1..03cf02f9 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zc1254_revA_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 59a33d49..3fcbf0eb 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu102_rev1_0_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 1d419250..3e562b37 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu104_revC_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 718cb331..4c9204dd 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-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_zcu106_revA_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 77b25847..0318d41c 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu111_revA_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 690f33fd..4e7d7952 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu1275_revB_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 23e480a1..be528965 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-UBOOT_MACHINE = "xilinx_zynqmp_zcu216_revA_defconfig"
+UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 
 SERIAL_CONSOLE ?= "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb
index a2b1430e..0d9158ee 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb
@@ -14,21 +14,12 @@ 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 \
                 zynq_microzed_config \
                 zynq_zed_config \
                 zynq_zc702_config \
                 zynq_zc706_config \
                 zynq_zybo_config \
-                xilinx_zynqmp_zcu102_rev1_0_config \
-                xilinx_zynqmp_zcu106_revA_config \
-                xilinx_zynqmp_zcu104_revC_config \
-                xilinx_zynqmp_zcu100_revC_config \
-                xilinx_zynqmp_zcu111_revA_config \
-                xilinx_zynqmp_zcu1275_revA_config \
-                xilinx_zynqmp_zcu1275_revB_config \
-                xilinx_zynqmp_zc1254_revA_config \
-                xilinx_zynqmp_p_a2197_00_revA_config \
                 xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \
-                xilinx_zynqmp_zcu216_revA_config \
                 "