meta-xilinx-vendor: Rename u-boot scripts and uenv packages

In meta-xilinx-core u-boot-zynq-scr and u-boot-zynq-uenv recipes are
renamed to u-boot-xlnx-scr and u-boot-xlnx-uenv. Hence change these
in all the configuration files.

Also move common EXTRA_IMAGEDEPENDS to zynq-generic.conf files.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

4 files changed, 4 insertions, 14 deletions

diff --git a/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf
index ce8058e4..750657dc 100644
--- a/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf
@@ -8,10 +8,7 @@ SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
-                u-boot-zynq-uenv \
-                virtual/boot-bin \
-                virtual/bootloader \
-                u-boot-zynq-scr \
+                u-boot-xlnx-uenv \
                 "
 
 KERNEL_DEVICETREE = "zynq-microzed.dtb"
diff --git a/meta-xilinx-vendor/conf/machine/minized-zynq7.conf b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf
index af9d982d..415ebc61 100644
--- a/meta-xilinx-vendor/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf
@@ -9,8 +9,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth"
 UBOOT_MACHINE ?= "zynq_minized_config"
 
 EXTRA_IMAGEDEPENDS += " \
-                u-boot-zynq-uenv \
-                virtual/bootloader \
+                u-boot-xlnx-uenv \
                 "
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf
index 31f5e220..3ce023a6 100644
--- a/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf
@@ -12,10 +12,7 @@ SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
-                u-boot-zynq-uenv \
-                virtual/boot-bin \
-                virtual/bootloader \
-                u-boot-zynq-scr \
+                u-boot-xlnx-uenv \
                 "
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf
index 74d117c0..37c4b6cc 100644
--- a/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf
@@ -12,10 +12,7 @@ SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
-                u-boot-zynq-uenv \
-                virtual/boot-bin \
-                virtual/bootloader \
-                u-boot-zynq-scr \
+                u-boot-xlnx-uenv \
                 "
 
 KERNEL_DEVICETREE = "zynq-zybo.dtb"