meta-xilinx: Clean up vendor specific machine configuration files

1. Add new metal-xilinx-vendor layer which supports vendor specific
   machine configuration files, device-tree, kernel, platform-init etc.
2. Moved below vendor machine conf files, dt and related configs from
   meta-xilinx-bsp and meta-xilinx-contrib to meta-xilinx-vendor layer.
    - microzed-zynq7.conf
    - minized-zynq7.conf
    - picozed-zynq7.conf
    - zedboard-zynq7.conf
    - zybo-zynq7.conf
    - zybo-linux-bd-zynq7.conf
    - ultra96-zynqmp.conf
3. Obsolete qemu-zynq7, s3adsp1800-qemu-microblazeeb, v350-versal and
   vc-p-a2197-00-versal from meta-xilinx-bsp layer. Users should use
   zynq-generic.conf for zynq7000 qemu boot should be functionally
   equivalent to qemu-zynq7.
4. Add new MAINTAINERS.md file and move maintainers, Mailing list and
   Patches content from meta-xilinx-* README.md to MAINTAINERS.md file.
5. Updated README.md file for supported board machines files in
   meta-xilinx-bsp, meta-xilinx-contrib and meta-xilinx-vendor layers.
6. Disabled old drm kernel patches for zybo-linux-bd-zynq mahcine in
   meta-xilinx-contrib layer as these patches doesn't apply on 5.x
   kernel, if we don't hear from patch submitter we will remove these
   patches from meta-xilinx-contrib layer.
7. Removed drm kernel cache metadate for zybo-linux-bd-zynq7 machine
   as these configs are already available in xilinx_zynq_defconfig.
8. Fixed build issue for u-boot by changing
   PREFERRED_PROVIDER_virtual/bootloader from u-boot to u-boot-xlnx.
9. Add meta-xilinx-vendor to bblayers.conf.sample

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
Signed-off-by: Mark Hatle <mhatle@xilinx.com>

38 files changed, 229 insertions, 298 deletions

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 00000000..d14b73e5
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,34 @@
+# Maintainers, Mailing list, Patches
+
+Please send any patches, pull requests, comments or questions for this layer to
+the [meta-xilinx mailing list](https://lists.yoctoproject.org/g/meta-xilinx):
+
+        meta-xilinx@lists.yoctoproject.org
+
+When sending patches, please make sure the email subject line includes
+"[meta-xilinx][PATCH]" and cc'ing the maintainers.
+
+For more details follow the OE community patch submission guidelines, as described in:
+
+https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
+https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
+
+`git send-email --subject-prefix 'meta-xilinx][PATCH' --to meta-xilinx@yoctoproject.org`
+
+**Maintainers:**
+
+        Mark Hatle <mark.hatle@xilinx.com>
+        Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
+        John Toomey <john.toomey@xilinx.com>
+
+> **Note:**
+
+* meta-xilinx-contrib layer:
+  * We don't have any maintainers when user submit a patch to this layer
+    email meta-xilinx@yoctoproject.org and cc'ing below reviewers.
+
+**Reviewers:**
+
+        Mark Hatle <mark.hatle@xilinx.com>
+        Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
+        John Toomey <john.toomey@xilinx.com>
diff --git a/meta-microblaze/README.md b/meta-microblaze/README.md
index 9e7ea2c6..acf6c253 100644
--- a/meta-microblaze/README.md
+++ b/meta-microblaze/README.md
@@ -1,24 +1,8 @@
-meta-microblaze
-===============
+# meta-microblaze
 
 This layer provides support specific to the MicroBlaze architecture
 
-
-Maintainers, Mailing list, Patches
-==================================
-
-Please send any patches, pull requests, comments or questions for this layer to
-the [meta-xilinx mailing list](https://lists.yoctoproject.org/listinfo/meta-xilinx):
-
-        meta-xilinx@lists.yoctoproject.org
-
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
-
-Dependencies
-============
+## Dependencies
 
 This layer depends on:
 
@@ -26,3 +10,8 @@ This layer depends on:
 
         URI: git://git.openembedded.org/openembedded-core
         layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
+
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-core
+        branch: master or xilinx current release version (e.g. hosister)
diff --git a/meta-xilinx-bsp/README.md b/meta-xilinx-bsp/README.md
index e4142861..f41f6d4a 100644
--- a/meta-xilinx-bsp/README.md
+++ b/meta-xilinx-bsp/README.md
@@ -1,56 +1,38 @@
-meta-xilinx
-===========
+# meta-xilinx
 
-This layer provides support for MicroBlaze, Zynq and ZynqMP.
+This layer provides support for MicroBlaze, Zynq, ZynqMP and Versal architectures Xilinx evaluation boards.
 
-Additional documentation:
+## Additional documentation:
 
-* [Building](README.building.md)
-* [Booting](README.booting.md)
+* [Building](../README.building.md)
+* [Booting](../README.booting.md)
 
-Supported Boards/Machines
-=========================
+## Supported Boards/Machines
 
-Boards/Machines supported by this layer:
+**Boards/Machines supported by this layer:**
 
-* MicroBlaze:
-  * [Xilinx ML605 (QEMU)](conf/machine/ml605-qemu-microblazeel.conf) - `ml605-qemu-microblazeel` (QEMU support)
-  * [Xilinx S3A DSP 1800 (QEMU)](conf/machine/s3adsp1800-qemu-microblazeeb.conf) - `s3adsp1800-qemu-microblazeeb` (QEMU support)
-  * [Xilinx KC705](conf/machine/kc705-microblazeel.conf) - `kc705-microblazeel`
-* Zynq:
-  * [Zynq (QEMU)](conf/machine/qemu-zynq7.conf) - `qemu-zynq7` (QEMU Support)
-  * [Xilinx ZC702](conf/machine/zc702-zynq7.conf) - `zc702-zynq7` (with QEMU support)
-  * [Xilinx ZC706](conf/machine/zc706-zynq7.conf) - `zc706-zynq7` (with QEMU support)
-  * [Avnet MicroZed](conf/machine/microzed-zynq7.conf) - `microzed-zynq7`
-  * [Avnet PicoZed](conf/machine/picozed-zynq7.conf) - `picozed-zynq7`
-  * [Avnet/Digilent ZedBoard](conf/machine/zedboard-zynq7.conf) - `zedboard-zynq7`
-  * [Digilent Zybo](conf/machine/zybo-zynq7.conf) - `zybo-zynq7`
-  * [Digilent Zybo Linux BD](conf/machine/zybo-linux-bd-zynq7.conf) - `zybo-linux-bd-zynq7`
-* ZynqMP:
-  * [Xilinx ZCU102](conf/machine/zcu102-zynqmp.conf) - `zcu102-zynqmp` (QEMU support)
-  * [Xilinx ZCU106](conf/machine/zcu106-zynqmp.conf) - `zcu106-zynqmp`
-  * [Xilinx ZCU104](conf/machine/zcu104-zynqmp.conf) - `zcu104-zynqmp`
+| Platform | Xilinx Board Variant | Machine Configuration file | Board Device tree |
+| ---| --- | ---| ---------- |
+|MicroBlaze|[Xilinx KC705](https://www.xilinx.com/products/boards-and-kits/ek-k7-kc705-g.html)|[kc705-microblazeel](conf/machine/kc705-microblazeel.conf)|`kc705-full`|
+|Zynq-7000|Zynq (QEMU)|[qemu-zynq7](conf/machine/qemu-zynq7.conf)|NA|
+||[Xilinx ZC702](https://www.xilinx.com/products/boards-and-kits/ek-z7-zc702-g.html)|[zc702-zynq7](conf/machine/zc702-zynq7.conf)|`zc702`|
+||[Xilinx ZC706](https://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html)|[zc706-zynq7](conf/machine/zc706-zynq7.conf)|`zc706`|
+|ZynqMP|[Xilinx ZCU102](https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html)|[zcu102-zynqmp](conf/machine/zcu102-zynqmp.conf)|`zcu102-rev1.0`|
+||[Xilinx ZCU104](https://www.xilinx.com/products/boards-and-kits/zcu104.html)|[zcu104-zynqmp](conf/machine/zcu104-zynqmp.conf)|`zcu104-revc`|
+||[Xilinx ZCU106](https://www.xilinx.com/products/boards-and-kits/zcu106.html)|[zcu106-zynqmp](conf/machine/zcu106-zynqmp.conf)|`zcu106-reva`|
+||[Xilinx ZCU111](https://www.xilinx.com/products/boards-and-kits/zcu111.html)|[zcu111-zynqmp](conf/machine/zcu111-zynqmp.conf)|`zcu111-reva`|
+||[Xilinx ZCU1275](https://www.xilinx.com/products/boards-and-kits/zcu1275.html)|[zcu1275-zynqmp](conf/machine/zcu1275-zynqmp.conf)|`zcu1275-revb`|
+||[Xilinx ZCU1285](https://www.xilinx.com/products/boards-and-kits/zcu1285.html)|[zcu1285-zynqmp](conf/machine/zcu1285-zynqmp.conf)|`zcu1285-reva`|
+||[Xilinx ZCU208](https://www.xilinx.com/products/boards-and-kits/zcu208.html)|[zcu208-zynqmp](conf/machine/zcu208-zynqmp.conf)|`zcu208-reva`|
+||[Xilinx ZCU216](https://www.xilinx.com/products/boards-and-kits/zcu216.html)|[zcu216-zynqmp](conf/machine/zcu216-zynqmp.conf)|`zcu216-reva`|
+|Versal|[Xilinx VCK190](https://www.xilinx.com/products/boards-and-kits/vck190.html)|[vck190-versal](conf/machine/vck190-versal.conf)|`versal-vck190-reva-x-ebm-01-reva`|
+||[Xilinx VMK180](https://www.xilinx.com/products/boards-and-kits/vmk180.html)|[vmk180-versal](conf/machine/vmk180-versal.conf)|`versal-vmk180-reva-x-ebm-01-reva`|
+||[Xilinx VCK5000](https://www.xilinx.com/products/boards-and-kits/vck5000.html)|[vck5000-versal](conf/machine/vck5000-versal.conf)|`versal-vck5000-reva-x-ebm-01-reva`|
 
-Additional information on Xilinx architectures can be found at:
-        http://www.xilinx.com/support/index.htm
+> **Note:** Additional information on Xilinx architectures can be found at:
+        https://www.xilinx.com/products/silicon-devices.html
 
-For Zybo Linux BD reference design, please see meta-xilinx-contrib layer
-
-Maintainers, Mailing list, Patches
-==================================
-
-Please send any patches, pull requests, comments or questions for this layer to
-the [meta-xilinx mailing list](https://lists.yoctoproject.org/listinfo/meta-xilinx):
-
-        meta-xilinx@lists.yoctoproject.org
-
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
-
-Dependencies
-============
+## Dependencies
 
 This layer depends on:
 
@@ -58,31 +40,9 @@ This layer depends on:
 
         URI: git://git.openembedded.org/openembedded-core
         layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
 
-Recipe Licenses
-===============
-
-Due to licensing restrictions some recipes in this layer rely on closed source
-or restricted content provided by Xilinx. In order to use these recipes you must
-accept or agree to the licensing terms (e.g. EULA, Export Compliance, NDA,
-Redistribution, etc). This layer **does not enforce** any legal requirement, it
-is the **responsibility of the user** the ensure that they are in compliance
-with any licenses or legal requirements for content used.
-
-In order to use recipes that rely on restricted content the `xilinx` license
-flag must be white-listed in the build configuration (e.g. `local.conf`). This
-can be done on a per package basis:
-
-        LICENSE_FLAGS_WHITELIST += "xilinx_pmu-rom"
-
-or generally:
-
-        LICENSE_FLAGS_WHITELIST += "xilinx"
-
-Generally speaking Xilinx content that is provided as a restricted download
-cannot be obtained without a Xilinx account, in order to use this content you
-must first download it with your Xilinx account and place the downloaded content
-in the `downloads/` directory of your build or on a `PREMIRROR`. Attempting to
-fetch the content using bitbake will fail, indicating the URL from which to
-acquire the content.
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-microblaze, meta-xilinx-core
+        branch: master or xilinx current release version (e.g. hosister)
 
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
deleted file mode 100644
index f28e3d4a..00000000
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: qemu-zynq7
-#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model)
-
-require conf/machine/zynq-generic.conf
-
-# Use the networking setup from qemuarm
-MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
-FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
deleted file mode 100644
index 12621357..00000000
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: s3adsp1800-qemu-microblazeeb
-#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model)
-
-TUNE_FEATURES:tune-microblaze ?= "microblaze v8.00 bigendian barrel-shift pattern-compare multiply-low"
-
-require conf/machine/microblaze-generic.conf
-
-MACHINE_FEATURES = ""
-
-USE_VT = ""
-SERIAL_CONSOLES ?= "115200;ttyUL0"
-
-KERNEL_IMAGETYPE ?= "linux.bin.ub"
-
-# This machine is a targeting a QEMU model, runqemu setup:
-QB_MEM = "-m 256"
-QB_MACHINE = "-machine petalogix-s3adsp1800"
-QB_OPT_APPEND = "-nographic -serial mon:stdio"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
-
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
deleted file mode 100644
index d865dc5a..00000000
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: v350-versal
-##@DESCRIPTION: Machine support for v350 versal.
-
-SOC_VARIANT = "ai-core"
-
-require conf/machine/versal-generic.conf
-
-# Add board compatibility override
-MACHINEOVERRIDES .= ":v350"
-
-EXTRA_IMAGEDEPENDS += " \
-   arm-trusted-firmware \
-   virtual/boot-bin \
-   virtual/bootloader \
-   virtual/psm-firmware \
-   virtual/plm \
-   u-boot-zynq-scr \
-"
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
deleted file mode 100644
index c20166e3..00000000
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#@TYPE: Machine
-#@NAME: vc-p-a2197-versal
-##@DESCRIPTION: Machine support for vc-p-a2197 versal .
-
-SOC_VARIANT = "ai-core"
-
-require conf/machine/versal-generic.conf
-
-# Add board compatibility override
-MACHINEOVERRIDES .= ":vc-p-a2197-00"
diff --git a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend
index f3c932db..2640c2c2 100644
--- a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,7 +1,3 @@
-YAML_MAIN_MEMORY_CONFIG:ultra96 ?= "psu_ddr_0"
-YAML_CONSOLE_DEVICE_CONFIG:ultra96 ?= "psu_uart_1"
-YAML_DT_BOARD_FLAGS:ultra96 ?= "{BOARD avnet-ultra96-rev1}"
-
 YAML_MAIN_MEMORY_CONFIG:kc705 ?= "mig_7series_0"
 YAML_CONSOLE_DEVICE_CONFIG:kc705 ?= "axi_uartlite_0"
 YAML_DT_BOARD_FLAGS:kc705 ?= "{BOARD kc705-full}"
@@ -10,7 +6,6 @@ YAML_DT_BOARD_FLAGS:zcu102 ?= "{BOARD zcu102-rev1.0}"
 YAML_DT_BOARD_FLAGS:zcu106 ?= "{BOARD zcu106-reva}"
 YAML_DT_BOARD_FLAGS:zc702 ?= "{BOARD zc702}"
 YAML_DT_BOARD_FLAGS:zc706 ?= "{BOARD zc706}"
-YAML_DT_BOARD_FLAGS:zedboard ?= "{BOARD zedboard}"
 YAML_DT_BOARD_FLAGS:zc1254 ?= "{BOARD zc1254-reva}"
 YAML_DT_BOARD_FLAGS:zcu104 ?= "{BOARD zcu104-revc}"
 YAML_DT_BOARD_FLAGS:zcu111 ?= "{BOARD zcu111-reva}"
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
index 94020f25..83f8c57b 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,19 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # device tree sources for the various machines
-COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
-SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
-
 COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
 SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
 
-COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
-SRC_URI:append:zybo-linux-bd-zynq7 = " \
-                file://zybo-linux-bd-zynq7.dts \
-                file://pcw.dtsi \
-                file://pl.dtsi \
-                "
-
 COMPATIBLE_MACHINE:kc705-microblazeel = ".*"
 SRC_URI:append:kc705-microblazeel = " \
                 file://kc705-microblazeel.dts \
diff --git a/meta-xilinx-contrib/README.md b/meta-xilinx-contrib/README.md
index 952392af..1b11d347 100644
--- a/meta-xilinx-contrib/README.md
+++ b/meta-xilinx-contrib/README.md
@@ -1,35 +1,21 @@
-meta-xilinx-contrib
-===================
+# meta-xilinx-contrib
 
 This layer is a contribution layer to support for MicroBlaze, Zynq and ZynqMP architectures.
-This layer depends on meta-xilinx-bsp layer.
+Any patches from open source contributors for vendor board can be added here.
 
-Supported Boards/Machines
-=========================
+## Supported Boards/Machines
 
-* Zynq:
-  * Digilent Zybo Linux BD Reference design
-  * [Avnet MiniZed](conf/machine/minized-zynq7.conf) - `minized-zynq7`
+**Boards/Machines supported by this layer:**
 
-Maintainers, Mailing list, Patches
-==================================
 
-Please send any patches, comments or questions for this layer to
-the [meta-xilinx mailing list](https://lists.yoctoproject.org/listinfo/meta-xilinx):
+| Platform | Vendor Board Variant | Machine Configuration file | Board Device tree |
+| ---| --- | ---| ---------- |
+|MicroBlaze|[Xilinx ML605 (QEMU)](https://www.digikey.com/en/products/detail/amd-xilinx/EK-V6-ML605-G/2175174)|[ml605-qemu-microblazeel](conf/machine/ml605-qemu-microblazeel.conf)|NA|
+|Zynq-7000|NA|NA|NA|
+|ZynqMP|NA|NA|NA|
+|Versal|NA|NA|NA|
 
-        meta-xilinx@lists.yoctoproject.org with '[meta-xilinx-contrib]' in the subject.
-
-
-Subscribe to mailing list at
-https://lists.yoctoproject.org/listinfo/meta-xilinx
-
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
-
-Dependencies
-============
+## Dependencies
 
 This layer depends on:
 
@@ -37,7 +23,9 @@ This layer depends on:
 
         URI: git://git.openembedded.org/openembedded-core
         layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
 
-        URI: git://git.openembedded.org/meta-xilinx
-
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-vendor
+        branch: master or xilinx current release version (e.g. hosister)
 
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-contrib/conf/machine/ml605-qemu-microblazeel.conf
index 157a75c2..157a75c2 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-contrib/conf/machine/ml605-qemu-microblazeel.conf
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
index 2ce919ac..8ba7a490 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
@@ -1,9 +1,12 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:"
 
-SRC_URI:append:zybo-linux-bd-zynq7 = " \
-        file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
-        file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
-        file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
-        "
+# Note: These patches are very old and doesn't apply on top of 5.x
+#       kernel. For more details refer README.md file.
+
+#SRC_URI:append:zybo-linux-bd-zynq7 = " \
+#       file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
+#       file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
+#       file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
+#       "
 
 SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git a/meta-xilinx-core/README.md b/meta-xilinx-core/README.md
index 8997760c..d450c4b3 100644
--- a/meta-xilinx-core/README.md
+++ b/meta-xilinx-core/README.md
@@ -1,24 +1,8 @@
-meta-xilinx-core
-================
+# meta-xilinx-core
 
-This layer provides support for MicroBlaze, Zynq and ZynqMP.
+This layer provides support for MicroBlaze, Zynq, ZynqMP and Versal architectures.
 
-
-Maintainers, Mailing list, Patches
-==================================
-
-Please send any patches, pull requests, comments or questions for this layer to
-the [meta-xilinx mailing list](https://lists.yoctoproject.org/listinfo/meta-xilinx):
-
-        meta-xilinx@lists.yoctoproject.org
-
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
-
-Dependencies
-============
+## Dependencies
 
 This layer depends on:
 
@@ -26,9 +10,10 @@ This layer depends on:
 
         URI: git://git.openembedded.org/openembedded-core
         layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
+
 
-Configuring Machines
-====================
+## Configuring Machines
 
 All machines that use meta-xilinx-tools should be derived from one of the
 following: microblaze-generic, zynq-generic, zynqmp-generic, or 
@@ -58,8 +43,7 @@ require you to specify the path to a PDI file using PDI_PATH.  The XSCT
 version will extract the PDI automatically.
 
 
-Recipe Licenses
-===============
+## Recipe Licenses
 
 Due to licensing restrictions some recipes in this layer rely on closed source
 or restricted content provided by Xilinx. In order to use these recipes you must
diff --git a/meta-xilinx-core/conf/bblayers.conf.sample b/meta-xilinx-core/conf/bblayers.conf.sample
index 890ef3b6..a98e8936 100644
--- a/meta-xilinx-core/conf/bblayers.conf.sample
+++ b/meta-xilinx-core/conf/bblayers.conf.sample
@@ -23,6 +23,7 @@ BBLAYERS ?= " \
     ##OEROOT##/../meta-xilinx/meta-xilinx-pynq \
     ##OEROOT##/../meta-xilinx/meta-xilinx-standalone \
     ##OEROOT##/../meta-xilinx/meta-xilinx-contrib \
+    ##OEROOT##/../meta-xilinx/meta-xilinx-vendor \
     ##OEROOT##/../meta-xilinx-tools \
     ##OEROOT##/../meta-petalinux \
     ##OEROOT##/../meta-virtualization \
diff --git a/meta-xilinx-pynq/README.md b/meta-xilinx-pynq/README.md
index a40ff96b..7f8163f2 100644
--- a/meta-xilinx-pynq/README.md
+++ b/meta-xilinx-pynq/README.md
@@ -1,26 +1,19 @@
 # meta-xilinx-pynq
 
-================================
-
-Introduction
--------------------------
+## Introduction
 
 This layer collects recipes required to build and run PYNQ based examples using jupyter-notebooks on yocto
 
-Maintainers, Patches/Submissions, Community
-===========================================
-Please open pull requests for any changes.
-
-Maintainers:
-
-  Sai Hari Chandana Kalluri (chandana.kalluri@xilinx.com)
-  Peter Ogden (ogden@xilinx.com)
+## Dependencies
 
-Layer dependencies
-=====================
+This layer depends on:
 
-URI: git://git.openembedded.org/bitbake
+        URI: git://git.openembedded.org/bitbake
 
-URI: git://git.openembedded.org/openembedded-core
+        URI: git://git.openembedded.org/openembedded-core
+        layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
 
-URI: git://git.openembedded.org/meta-openembedded
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-core
+        branch: master or xilinx current release version (e.g. hosister)
diff --git a/meta-xilinx-standalone-experimental/README.md b/meta-xilinx-standalone-experimental/README.md
index e49b01f2..99675b0a 100644
--- a/meta-xilinx-standalone-experimental/README.md
+++ b/meta-xilinx-standalone-experimental/README.md
@@ -1,5 +1,5 @@
-meta-xilinx-standalone-experimental
-===================================
+# meta-xilinx-standalone-experimental
+
 This layer contains experimental items that may eventually be added
 to the meta-xilinx-standalone layer.  The components in this layer
 may or may not be buildable as they may require unreleased code.
@@ -9,9 +9,9 @@ this should be considered to be a preview release only.  For instance,
 some components may not be buildable, expect APIs to change on various
 parts and pieces.
 
-Build Instructions
-------------------
-Note: to use this layer you must REMOVE meta-xilinx-tools from your
+## Build Instructions
+
+**Note:** to use this layer you must REMOVE meta-xilinx-tools from your
 project.  meta-xilinx-tools is not compatible with this experimental
 approach.  You may also have to remove other layers that depend
 on meta-xilinx-tools, such as meta-som.
@@ -32,27 +32,18 @@ To install the setup SDK:
 Then follow the instructions in the 'prestep/README-setup' file.
 
 
-Maintainers, Mailing list, Patches
-==================================
-
-Please send any patches, pull requests, comments or questions for this 
-layer to the [meta-xilinx mailing list]
-(https://lists.yoctoproject.org/listinfo/meta-xilinx):
-
-        meta-xilinx@lists.yoctoproject.org
 
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
-
-Dependencies
-============
+## Dependencies
 
 This layer depends on:
 
-     URI: git://git.yoctoproject.org/poky
+        URI: git://git.openembedded.org/bitbake
+
+        URI: git://git.openembedded.org/openembedded-core
+        layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
 
-     URI: git://git.yoctoproject.org/meta-xilinx/meta-xilinx-standalone
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-core, meta-xilinx-bsp, meta-xilinx-standalone
+        branch: master or xilinx current release version (e.g. hosister)
 
-     URI: git://git.yoctoproject.org/meta-xilinx/meta-xilinx-bsp
diff --git a/meta-xilinx-standalone/README.md b/meta-xilinx-standalone/README.md
index a3514230..ea9fdbc4 100644
--- a/meta-xilinx-standalone/README.md
+++ b/meta-xilinx-standalone/README.md
@@ -1,5 +1,4 @@
-meta-xilinx-standalone
-======================
+# meta-xilinx-standalone
 
 This layer is meant to augment Yocto/OE functionality to provide a 
 Baremetal/Standalone Toolchain as well as a generic version of various
@@ -8,15 +7,14 @@ firmware that is required to boot a ZynqMP or Versal system.
 For optimized versions of the firmware and additional components you must
 use the meta-xilinx-tools layer.
 
-Building
---------
+## Building
+
 The software in this layer may be used in either a standard single
 configuration build, or a multiconfig build.  A multiconfig build, along
 with the MACHINES defined in meta-xilinx-bsps will automate the generation
 of certain firmwares.
 
-Toolchains
-----------
+## Toolchains
 
 To build standalone toolchains similar to those embedded with the
 Xilinx xsct tooling:
@@ -29,8 +27,7 @@ Use one of the custom machines:
 
 MACHINE=<machine> DISTRO=xilinx-standalone bitbake meta-toolchain
 
-Standalone Firmware
--------------------
+## Standalone Firmware
 
 The standalone firmware is a genericly configured firmware, it can be
 build either in a single standalong configuration, or via an automated
@@ -89,25 +86,17 @@ MACHINE=zynqmp-generic bitbake fsbl pmufw
 MACHINE=versal-generic bitbake plmfw psmfw
 
 
-Maintainers, Mailing list, Patches
-==================================
-
-Please send any patches, pull requests, comments or questions for this 
-layer to the [meta-xilinx mailing list]
-(https://lists.yoctoproject.org/listinfo/meta-xilinx):
-
-        meta-xilinx@lists.yoctoproject.org
+## Dependencies
 
-Maintainers:
-
-        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-        Mark Hatle <mark.hatle@xilinx.com>
+This layer depends on:
 
-Dependencies
-============
+        URI: git://git.openembedded.org/bitbake
 
-This layer depends on:
+        URI: git://git.openembedded.org/openembedded-core
+        layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
 
-     URI: git://git.yoctoproject.org/poky
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-bsp
+        branch: master or xilinx current release version (e.g. hosister)
 
-     URI: git://git.yoctoproject.org/meta-xilinx/meta-xilinx-bsp
diff --git a/meta-xilinx-vendor/COPYING.MIT b/meta-xilinx-vendor/COPYING.MIT
new file mode 100644
index 00000000..fb950dc6
--- /dev/null
+++ b/meta-xilinx-vendor/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-xilinx-vendor/README.md b/meta-xilinx-vendor/README.md
new file mode 100644
index 00000000..51ff84e1
--- /dev/null
+++ b/meta-xilinx-vendor/README.md
@@ -0,0 +1,37 @@
+# meta-xilinx-vendor
+
+This layer provides support for MicroBlaze, Zynq, ZynqMP and Versal architectures vendor boards.
+
+## Supported Boards/Machines
+
+**Boards/Machines supported by this layer:**
+
+
+| Platform | Vendor Board Variant | Machine Configuration file | Board Device tree |
+| ---| --- | ---| ---------- |
+|MicroBlaze|[Xilinx S3A DSP 1800](https://shop.trenz-electronic.de/en/TE0320-00-EV02I-FPGA-Module-with-Spartan-3A-DSP-1800K-EV02I-1-Gbit-DDR-RAM)|[s3adsp1800-qemu-microblazeeb](conf/machine/s3adsp1800-qemu-microblazeeb.conf)|NA|
+|Zynq-7000|[Avent Microzed](https://www.xilinx.com/products/boards-and-kits/1-5lakcu.html)|[microzed-zynq7](conf/machine/microzed-zynq7.conf)|`zynq-microzed.dtb`|
+||[Avnet Picozed](https://www.xilinx.com/products/boards-and-kits/1-58nuel.html)|[picozed-zynq7](conf/machine/picozed-zynq7.conf)|NA|
+||[Avnet Minized](https://www.xilinx.com/products/boards-and-kits/1-odbhjd.html)|[minized-zynq7](conf/machine/minized-zynq7.conf)|NA|
+||[Avnet/Digilent ZedBoard](https://www.xilinx.com/products/boards-and-kits/1-8dyf-11.html)|[zedboard-zynq7](conf/machine/zedboard-zynq7.conf)|NA|
+||[Digilent Zybo](https://www.xilinx.com/support/university/boards-portfolio/xup-boards/DigilentZYBO.html)|[zybo-zynq7](conf/machine/zybo-zynq7.conf)|`zynq-zybo.dtb`|
+||[Digilent Zybo Linux BD](https://www.xilinx.com/support/university/boards-portfolio/xup-boards/DigilentZYBO.html)|[zybo-linux-bd-zynq7](conf/machine/zybo-linux-bd-zynq7.conf)|NA|
+|ZynqMP|[Avent Ultra96](https://www.xilinx.com/products/boards-and-kits/1-vad4rl.html)|[ultra96-zynqmp](conf/machine/ultra96-zynqmp.conf)|`avnet-ultra96-rev1`|
+|Versal|NA|NA|NA|
+
+> **Note:** 
+`For Zybo Linux BD reference design, please see meta-xilinx-contrib layer`
+
+## Dependencies
+
+This layer depends on:
+
+        URI: git://git.openembedded.org/bitbake
+
+        URI: git://git.openembedded.org/openembedded-core
+        layers: meta
+        branch: master or xilinx current release version (e.g. hosister)
+
+        URI: git://git.yoctoproject.org/meta-xilinx.git
+        layers: meta-xilinx-microblaze, meta-xilinx-core
+        branch: master or xilinx current release version (e.g. hosister)
diff --git a/meta-xilinx-vendor/conf/layer.conf b/meta-xilinx-vendor/conf/layer.conf
new file mode 100644
index 00000000..b3e81efc
--- /dev/null
+++ b/meta-xilinx-vendor/conf/layer.conf
@@ -0,0 +1,13 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "xilinx-vendor"
+BBFILE_PATTERN_xilinx-vendor = "^${LAYERDIR}/"
+BBFILE_PRIORITY_xilinx-vendor = "5"
+
+LAYERDEPENDS_xilinx-vendor = "xilinx"
+LAYERSERIES_COMPAT_xilinx-vendor = "honister"
diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-vendor/conf/machine/include/board/ultra96.inc
index bfb57e00..bfb57e00 100644
--- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
+++ b/meta-xilinx-vendor/conf/machine/include/board/ultra96.inc
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf
index c0e8e6dd..ce8058e4 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf
@@ -4,9 +4,6 @@
 
 require conf/machine/zynq-generic.conf
 
-# u-boot configuration
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf
index a7c549cc..af9d982d 100644
--- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf
@@ -2,13 +2,10 @@
 #@NAME: minized-zynq7
 #@DESCRIPTION: Machine support for MiniZed. (http://www.minized.org/)
 
-require conf/machine/include/tune-zynq.inc
-require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/zynq-generic.conf
 
 MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth"
 
-# u-boot configuration
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE ?= "zynq_minized_config"
 
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf
index d4f63f95..31f5e220 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf
@@ -8,9 +8,6 @@
 
 require conf/machine/zynq-generic.conf
 
-# u-boot configuration
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index ff74ac3d..ff74ac3d 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-vendor/conf/machine/zedboard-zynq7.conf
index 4da6bb4e..4da6bb4e 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/zedboard-zynq7.conf
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-vendor/conf/machine/zybo-linux-bd-zynq7.conf
index df26ea0d..98718ae3 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/zybo-linux-bd-zynq7.conf
@@ -7,8 +7,6 @@
 
 require conf/machine/zynq-generic.conf
 
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-
 MACHINE_FEATURES += "keyboard screen alsa sdio"
 
 SPL_BINARY ?= "spl/boot.bin"
@@ -22,6 +20,5 @@ IMAGE_BOOT_FILES += " \
                 "
 
 KERNEL_FEATURES += " \
-                bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc \
                 features/xilinx/v4l2/v4l2.scc \
                 "
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf
index aa1eafe4..74d117c0 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf
@@ -8,8 +8,6 @@
 
 require conf/machine/zynq-generic.conf
 
-# u-boot configuration
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
 
diff --git a/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend
new file mode 100644
index 00000000..963940f5
--- /dev/null
+++ b/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend
@@ -0,0 +1,7 @@
+# Ultra96 device tree configuration
+YAML_MAIN_MEMORY_CONFIG:ultra96 ?= "psu_ddr_0"
+YAML_CONSOLE_DEVICE_CONFIG:ultra96 ?= "psu_uart_1"
+YAML_DT_BOARD_FLAGS:ultra96 ?= "{BOARD avnet-ultra96-rev1}"
+
+# ZedBoard device tree configuration
+YAML_DT_BOARD_FLAGS:zedboard ?= "{BOARD zedboard}"
diff --git a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend b/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend
index e925d608..e925d608 100644
--- a/meta-xilinx-bsp/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend
+++ b/meta-xilinx-vendor/dynamic-layers/meta-xilinx-tools/recipes-bsp/embeddedsw/pmu-firmware_%.bbappend
diff --git a/meta-xilinx-vendor/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-vendor/recipes-bsp/device-tree/device-tree.bbappend
new file mode 100644
index 00000000..341e69dc
--- /dev/null
+++ b/meta-xilinx-vendor/recipes-bsp/device-tree/device-tree.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+# device tree sources for the various machines
+COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
+SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
+
+COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
+SRC_URI:append:zybo-linux-bd-zynq7 = " \
+                file://zybo-linux-bd-zynq7.dts \
+                file://pcw.dtsi \
+                file://pl.dtsi \
+                "
+
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts b/meta-xilinx-vendor/recipes-bsp/device-tree/files/picozed-zynq7.dts
index 6f9b653a..6f9b653a 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
+++ b/meta-xilinx-vendor/recipes-bsp/device-tree/files/picozed-zynq7.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
index 0f678d39..0f678d39 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
+++ b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
index 32bc7688..32bc7688 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
+++ b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
index 19654392..19654392 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
+++ b/meta-xilinx-vendor/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bbappend b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init.bbappend
index fbe42821..fbe42821 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bbappend
+++ b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init.bbappend
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
index 5587ab25..5587ab25 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
+++ b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h
index df5205e8..df5205e8 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h
+++ b/meta-xilinx-vendor/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h