various: Remove 2022.x versions

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

50 files changed, 0 insertions, 1474 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index a32a354a..5007761f 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -50,8 +50,6 @@ DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
 PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
 
-XILINX_ATF_VERSION[v2022.1] = "2.6-xilinx-v2022.1%"
-XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%"
 XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
 XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
 XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
@@ -63,8 +61,6 @@ XILINX_ATF_PROVIDERS[v2024.2] = "trusted-firmware-a"
 PREFERRED_PROVIDER_virtual/arm-trusted-firmware = "${@d.getVarFlag('XILINX_ATF_PROVIDERS', d.getVar('XILINX_RELEASE_VERSION')) or 'arm-trusted-firmware'}"
 
 
-XILINX_UBOOT_VERSION[v2022.1] = "1:2021.01-xilinx-v2022.1%"
-XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%"
 XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%"
 XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%"
 XILINX_UBOOT_VERSION[v2024.1] = "1:2024.01-xilinx-v2024.1%"
@@ -73,8 +69,6 @@ XILINX_UBOOT_VERSION[v2024.2] = "1:2024.01-xilinx-v2024.2%"
 PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
-XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
 XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
 XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
 XILINX_LINUX_VERSION[v2024.1] = "6.6.10%"
@@ -82,8 +76,6 @@ XILINX_LINUX_VERSION[v2024.2] = "6.6.40%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # XRT/ZOCL
-XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
-XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
 XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
 XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
 XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.319"
@@ -92,16 +84,12 @@ PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_R
 PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # AI-Engine
-AIEFAL_VERSION[v2022.1] = "1.4"
-AIEFAL_VERSION[v2022.2] = "1.4"
 AIEFAL_VERSION[v2023.1] = "1.5"
 AIEFAL_VERSION[v2023.2] = "1.5"
 AIEFAL_VERSION[v2024.1] = "1.6"
 AIEFAL_VERSION[v2024.2] = "1.7"
 PREFERRED_VERSION_aiefal ?= "${@d.getVarFlag('AIEFAL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-AI_ENGINE_DRIVER_VERSION[v2022.1] = "3.3"
-AI_ENGINE_DRIVER_VERSION[v2022.2] = "3.3"
 AI_ENGINE_DRIVER_VERSION[v2023.1] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2023.2] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2024.1] = "3.5"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend
deleted file mode 100644
index 0e7f3693..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use libmetal for systems with AIE
-# For versal devices with the ai-engine
-PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
-EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
-TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
-DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
-RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend
deleted file mode 100644
index 0e7f3693..00000000
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use libmetal for systems with AIE
-# For versal devices with the ai-engine
-PACKAGE_ARCH_orig := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}"
-EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}"
-TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}"
-DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
-RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
deleted file mode 100644
index 0b3effe2..00000000
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Xilinx AI Engine runtime"
-DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP"
-
-require aie-rt-2022.inc
-
-SECTION = "libs"
-
-AIEDIR ?= "${S}/driver"
-S = "${UNPACKDIR}/git"
-I = "${AIEDIR}/include"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "aie"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-IOBACKENDS ?= "Linux"
-
-DEPENDS = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
-RDEPENDS:${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}"
-
-PROVIDES = "libxaiengine"
-RPROVIDES:${PN} = "libxaiengine"
-
-# The makefile isn't ready for parallel execution at the moment
-PARALLEL_MAKE = "-j 1"
-
-CFLAGS += "-Wall -Wextra -fno-thread-jumps -fno-tree-pre"
-CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'Linux', ' -D__AIELINUX__', '', d)}"
-CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'metal', ' -D__AIEMETAL__', '', d)}"
-EXTRA_OEMAKE = "-C ${AIEDIR}/src -f Makefile.Linux CFLAGS='${CFLAGS}'"
-
-
-do_compile(){
-        oe_runmake
-}
-
-do_install(){
-        install -d ${D}${includedir}
-        install ${I}/*.h ${D}${includedir}/
-        install -d ${D}${includedir}/xaiengine
-        install ${I}/xaiengine/*.h ${D}${includedir}/xaiengine/
-        install -d ${D}${libdir}
-        cp -dr ${AIEDIR}/src/*.so* ${D}${libdir}
-}
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2022.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2022.inc
deleted file mode 100644
index 85121654..00000000
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2022.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "libs"
-
-REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-SRCREV ?= "ae24c8ede049906323510693f37e6167a963fd0e"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM ?= "file://license.txt;md5=b81abf1f508952331dd7d2ab36408f5b"
-
-SRC_URI = "${REPO};branch=${BRANCH}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
deleted file mode 100644
index 73cbfdd6..00000000
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)"
-DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP"
-
-require aie-rt-2022.inc
-
-SECTION = "devel"
-
-XAIEFAL_DIR ?= "fal"
-S = "${UNPACKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "aie"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-IOBACKENDS ?= "Linux"
-
-PROVIDES = "aiefal"
-ALLOW_EMPTY:${PN} = "1"
-
-inherit pkgconfig cmake
-
-DEPENDS = "libxaiengine"
-
-OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}"
-
-EXTRA_OECMAKE = "-DWITH_TESTS=OFF "
-EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES') == 'y' else '-DWITH_EXAMPLES=OFF'}"
-
-FILES:${PN}-demos = " \
-    ${bindir}/* \
-"
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb
deleted file mode 100644
index 348ad757..00000000
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84"
-BRANCH = "xlnx_rebase_v2.6"
-LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-
-
-include arm-trusted-firmware.inc
-
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb
deleted file mode 100644
index 365bbbc5..00000000
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa"
-BRANCH = "xlnx_rebase_v2.6"
-LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-
-
-include arm-trusted-firmware.inc
-
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb
deleted file mode 100644
index 94369955..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2022.1.inc
-
-# MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
-# bmp_logo.h
-SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"'
-
-# Default do_compile fails with:
-# | error: object directory ../downloads/git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates.
-# The regular workaround of calling 'git diff' seems to be problematic.
-do_compile () {
-        oe_runmake -C ${S} tools-only_defconfig O=${B}
-
-        # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
-        # generating it requires bin2header tool, which for target build
-        # is built with target tools and thus cannot be executed on host.
-        sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} ${B}/.config
-
-        oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B}
-}
-
-# mkeficapsule is not available in this version of u-boot
-PROVIDES:remove = "${MLPREFIX}u-boot-mkeficapsule"
-PROVIDES:class-native:remove = "u-boot-mkeficapsule-native"
-PACKAGES:remove = "${PN}-mkeficapsule"
-RDEPENDS:${PN}:remove = "${PN}-mkeficapsule"
-
-do_install:prepend() {
-        # Avoid do_install failure
-        mkdir -p tools
-        touch tools/mkeficapsule
-}
-
-do_install:append() {
-        # Avoid failure
-        rm -rf ${D}${bindir}/uboot-mkeficapsule
-        rm -rf ${D}${bindir}/mkeficapsule
-}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb
deleted file mode 100644
index 6b033f0f..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require u-boot-tools-xlnx.inc
-require u-boot-xlnx-2022.2.inc
-
-# MUST clear CONFIG_VIDEO to avoid a compilation failure trying to construct
-# bmp_logo.h
-SED_CONFIG_EFI:append = ' -e "s/CONFIG_VIDEO=.*/# CONFIG_VIDEO is not set/"'
-
-# Default do_compile fails with:
-# | error: object directory ../downloads/git2/github.com.Xilinx.u-boot-xlnx.git/objects does not exist; check .git/objects/info/alternates.
-# The regular workaround of calling 'git diff' seems to be problematic.
-do_compile () {
-        oe_runmake -C ${S} tools-only_defconfig O=${B}
-
-        # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
-        # generating it requires bin2header tool, which for target build
-        # is built with target tools and thus cannot be executed on host.
-        sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} ${B}/.config
-
-        oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B}
-}
-
-# mkeficapsule is not available in this version of u-boot
-PROVIDES:remove = "${MLPREFIX}u-boot-mkeficapsule"
-PROVIDES:class-native:remove = "u-boot-mkeficapsule-native"
-PACKAGES:remove = "${PN}-mkeficapsule"
-RDEPENDS:${PN}:remove = "${PN}-mkeficapsule"
-
-do_install:prepend() {
-        # Avoid do_install failure
-        mkdir -p tools
-        touch tools/mkeficapsule
-}
-
-do_install:append() {
-        # Avoid failure
-        rm -rf ${D}${bindir}/uboot-mkeficapsule
-        rm -rf ${D}${bindir}/mkeficapsule
-}
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h
deleted file mode 100644
index 08c1c16c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic-top.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This file is use for addition u-boot configurations for microblaze.
- */
-#include <configs/microblaze-generic.h>
-
-/* Core microblaze boot configurations */
-#define XILINX_USE_DCACHE       1
-#define CONFIG_CMD_IRQ
-#define CONFIG_DCACHE
-#define CONFIG_ICACHE
\ No newline at end of file
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg
deleted file mode 100644
index 0f784f73..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2021.01/microblaze-generic.cfg
+++ /dev/null
@@ -1,81 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-#........................................................................
-#                                WARNING
-#
-# This file is a u-boot configuration fragment, and not a full u-boot
-# configuration file. The final u-boot configuration is made up of
-# an assembly of processed fragments, each of which is designed to
-# capture a specific part of the final configuration (e.g. platform
-# configuration, feature configuration, and board specific hardware
-# configuration).  For more information on u-boot configuration, please
-# refer the product documentation.
-#
-#.......................................................................
-
-#
-# Definitions for Generic Microbalze machine.
-#
-CONFIG_BOOTDELAY=4
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_SYS_PROMPT="U-Boot>"
-CONFIG_SYS_CONFIG_NAME="microblaze-generic-top"
-CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
-# CONFIG_SYS_NS16550 is not set
-# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
-# CONFIG_SYS_FLASH_CFI is not set
-# CONFIG_FLASH_CFI_DRIVER is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_MTD_NOR_FLASH is not set
-# CONFIG_MTD_DEVICE is not set
-# CONFIG_SYS_FLASH_PROTECTION is not set
-# CONFIG_SPI_FLASH_SST is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_PHY_VITESSE is not set
-# CONFIG_CMD_EXT2 is not set
-# CONFIG_CMD_EXT4 is not set
-# CONFIG_CMD_EXT4_WRITE is not set
-# CONFIG_CMD_FAT is not set
-# CONFIG_DOS_PARTITION is not set
-# CONFIG_FAT_WRITE is not set
-CONFIG_DM=y
-CONFIG_SYS_MALLOC_F=y
-CONFIG_XILINX_UARTLITE=y
-CONFIG_XILINX_AXIEMAC=y
-CONFIG_PHY_XILINX=y
-CONFIG_PHY_TI=y
-CONFIG_NET=y
-CONFIG_PHY_GIGE=y
-CONFIG_NETDEVICES=y
-CONFIG_CMD_NET=y
-CONFIG_DM_ETH=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DHCP=y
-CONFIG_PHYLIB=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_NFS=y
-CONFIG_CMD_MII=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_XILINX_SPI=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_SF=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_BAR=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_DM_SPI=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI=y
-CONFIG_SPI_FLASH_ISSI=y
-# CONFIG_BOOTARGS is not set
-# CONFIG_USE_BOOTARGS is not set
-# CONFIG_SPL is not set
-# CONFIG_I2C_EEPROM is not set
-# CONFIG_CMD_EEPROM is not set
-# CONFIG_SYS_I2C_EEPROM_ADDR is not set
-# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h
deleted file mode 100644
index 08c1c16c..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This file is use for addition u-boot configurations for microblaze.
- */
-#include <configs/microblaze-generic.h>
-
-/* Core microblaze boot configurations */
-#define XILINX_USE_DCACHE       1
-#define CONFIG_CMD_IRQ
-#define CONFIG_DCACHE
-#define CONFIG_ICACHE
\ No newline at end of file
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg
deleted file mode 100644
index 0f784f73..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg
+++ /dev/null
@@ -1,81 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-#........................................................................
-#                                WARNING
-#
-# This file is a u-boot configuration fragment, and not a full u-boot
-# configuration file. The final u-boot configuration is made up of
-# an assembly of processed fragments, each of which is designed to
-# capture a specific part of the final configuration (e.g. platform
-# configuration, feature configuration, and board specific hardware
-# configuration).  For more information on u-boot configuration, please
-# refer the product documentation.
-#
-#.......................................................................
-
-#
-# Definitions for Generic Microbalze machine.
-#
-CONFIG_BOOTDELAY=4
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_SYS_PROMPT="U-Boot>"
-CONFIG_SYS_CONFIG_NAME="microblaze-generic-top"
-CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000
-# CONFIG_SYS_NS16550 is not set
-# CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set
-# CONFIG_SYS_FLASH_CFI is not set
-# CONFIG_FLASH_CFI_DRIVER is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_MTD_NOR_FLASH is not set
-# CONFIG_MTD_DEVICE is not set
-# CONFIG_SYS_FLASH_PROTECTION is not set
-# CONFIG_SPI_FLASH_SST is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_PHY_VITESSE is not set
-# CONFIG_CMD_EXT2 is not set
-# CONFIG_CMD_EXT4 is not set
-# CONFIG_CMD_EXT4_WRITE is not set
-# CONFIG_CMD_FAT is not set
-# CONFIG_DOS_PARTITION is not set
-# CONFIG_FAT_WRITE is not set
-CONFIG_DM=y
-CONFIG_SYS_MALLOC_F=y
-CONFIG_XILINX_UARTLITE=y
-CONFIG_XILINX_AXIEMAC=y
-CONFIG_PHY_XILINX=y
-CONFIG_PHY_TI=y
-CONFIG_NET=y
-CONFIG_PHY_GIGE=y
-CONFIG_NETDEVICES=y
-CONFIG_CMD_NET=y
-CONFIG_DM_ETH=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DHCP=y
-CONFIG_PHYLIB=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_NFS=y
-CONFIG_CMD_MII=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_XILINX_SPI=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_SF=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_BAR=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_DM_SPI=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI=y
-CONFIG_SPI_FLASH_ISSI=y
-# CONFIG_BOOTARGS is not set
-# CONFIG_USE_BOOTARGS is not set
-# CONFIG_SPL is not set
-# CONFIG_I2C_EEPROM is not set
-# CONFIG_CMD_EEPROM is not set
-# CONFIG_SYS_I2C_EEPROM_ADDR is not set
-# CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
deleted file mode 100644
index 69c7a639..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-UBRANCH ?= "xlnx_rebase_v2022.01_2022.1_update"
-
-SRCREV = "91ad7924e7f59584d597353e1bb86794341e0a7e"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
-
-# 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 \
-                "
-
-DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2021.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
deleted file mode 100644
index d111ae99..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-UBRANCH ?= "xlnx_rebase_v2022.01"
-
-SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
-
-# 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 \
-                "
-
-DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2022.01:"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb
deleted file mode 100644
index c1c45e56..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-
-require u-boot-xlnx.inc
-require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2022.1.inc
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb
deleted file mode 100644
index b10f321b..00000000
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-
-require u-boot-xlnx.inc
-require u-boot-spl-zynq-init.inc
-require u-boot-xlnx-2022.2.inc
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
deleted file mode 100644
index 41c1ffe2..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LINUX_VERSION = "5.15.19"
-KBRANCH="xlnx_rebase_v5.15_LTS_2022.1_update"
-SRCREV = "75872fda9ad270b611ee6ae2433492da1e22b688"
-
-KCONF_AUDIT_LEVEL="0"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
deleted file mode 100644
index 260224b8..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LINUX_VERSION = "5.15.36"
-KBRANCH="xlnx_rebase_v5.15_LTS"
-SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189"
-
-KCONF_AUDIT_LEVEL="0"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479.inc
deleted file mode 100644
index 38fbd162..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-BRANCH= "2022.1"
-SRCREV= "5e92a513c6950e79638b1a879ddb882da34fc683"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479/xrt-cstdint.patch
deleted file mode 100644
index 58c3736a..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202210.2.13.479/xrt-cstdint.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From e60fd92415bc849293944dd8fb7a72241df6055f Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Mon, 20 May 2024 19:38:06 -0600
-Subject: [PATCH] Add cstdint as necessary
-
-In GCC 13.1 usage of uint64 and similar will result in an error without
- #include <cstdint>
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- src/runtime_src/core/common/time.h                               | 1 +
- src/runtime_src/core/edge/common/aie_parser.h                    | 1 +
- src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h | 1 +
- src/runtime_src/core/edge/user/zynq_dev.h                        | 1 +
- src/runtime_src/tools/xclbinutil/CBOR.h                          | 1 +
- src/runtime_src/tools/xclbinutil/DTCStringsBlock.h               | 1 +
- src/runtime_src/tools/xclbinutil/XclBinSignature.h               | 1 +
- src/runtime_src/xdp/profile/database/events/vtf_event.h          | 1 +
- src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h  | 1 +
- src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h           | 1 +
- 10 files changed, 10 insertions(+)
-
-diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h
-index a4a96b11d..585d38756 100644
---- a/src/runtime_src/core/common/time.h
-+++ b/src/runtime_src/core/common/time.h
-@@ -19,6 +19,7 @@
- 
- #include "core/common/config.h"
- #include <string>
-+#include <cstdint>
- 
- namespace xrt_core {
- 
-diff --git a/src/runtime_src/core/edge/common/aie_parser.h b/src/runtime_src/core/edge/common/aie_parser.h
-index 5bc32a36a..f35e97ecd 100644
---- a/src/runtime_src/core/edge/common/aie_parser.h
-+++ b/src/runtime_src/core/edge/common/aie_parser.h
-@@ -20,6 +20,7 @@
- #include <string>
- #include <vector>
- #include <unordered_map>
-+#include <cstdint>
- #include "../user/aie/common_layer/adf_api_config.h"
- 
- namespace xrt_core {
-diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-index 196304765..36ce35e80
---- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-@@ -18,6 +18,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- namespace adf
- {
-diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
-index 6fe36c615..2abd7473b 100644
---- a/src/runtime_src/core/edge/user/zynq_dev.h
-+++ b/src/runtime_src/core/edge/user/zynq_dev.h
-@@ -19,6 +19,7 @@
- #include <fstream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- class zynq_device {
- public:
-diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h
-index e0f1175cd..d8c97ceb4 100644
---- a/src/runtime_src/tools/xclbinutil/CBOR.h
-+++ b/src/runtime_src/tools/xclbinutil/CBOR.h
-@@ -22,6 +22,7 @@
- // #includes here - please keep these to a bare minimum!
- #include <string>
- #include <sstream>
-+#include <cstdint>
- 
- // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
- // Forward declarations - use these instead whenever possible...
-diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-index 1ccd7ffc3..e20ae034a 100644
---- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-+++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-@@ -22,6 +22,7 @@
- // #includes here - please keep these to a bare minimum!
- #include <string>
- #include <sstream>
-+#include <cstdint>
- 
- // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
- // Forward declarations - use these instead whenever possible...
-diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-index b19ab56a4..f1b72d4d2 100644
---- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-+++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-@@ -18,6 +18,7 @@
- #define __XclBinSignature_h_
- 
- #include <string>
-+#include <cstdint>
- 
- // ----------------------- I N C L U D E S -----------------------------------
- 
-diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h
-index 24a755a9a..a46a43e9d 100644
---- a/src/runtime_src/xdp/profile/database/events/vtf_event.h
-+++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h
-@@ -18,6 +18,7 @@
- #define VTF_EVENT_DOT_H
- 
- #include <fstream>
-+#include <cstdint>
- 
- #include "xdp/config.h"
- 
-diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-index f1369fe02..1f7486c7e 100644
---- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-+++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-@@ -18,6 +18,7 @@
- #define XDP_PROFILE_AIE_TRACE_LOGGER_H
- 
- #include<iostream>
-+#include<cstdint>
- 
- namespace xdp {
- 
-diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-index a88597464..f392ec0e6 100644
---- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-+++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-@@ -19,6 +19,7 @@
- 
- #include <fstream>
- #include <string>
-+#include <cstdint>
- 
- #include "xdp/config.h"
- 
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0.inc
deleted file mode 100644
index e4bb423c..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-BRANCH= "2022.2"
-SRCREV= "43926231f7183688add2dccfd391b36a1f000bea"
-
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch
deleted file mode 100644
index 5546e0a4..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202220.2.14.0/xrt-cstdint.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-From f97ca31fc1b9aa973a2970e9248bc19f44b6a42f Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Mon, 20 May 2024 20:32:42 -0600
-Subject: [PATCH] Add cstdint as necessary
-
-In GCC 13.1 usage of uint64 and similar will result in an error without
- #include <cstdint>
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- src/runtime_src/core/common/time.h                               | 1 +
- src/runtime_src/core/edge/common/aie_parser.h                    | 1 +
- src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h | 1 +
- src/runtime_src/core/edge/user/zynq_dev.h                        | 1 +
- src/runtime_src/tools/xclbinutil/CBOR.h                          | 1 +
- src/runtime_src/tools/xclbinutil/DTCStringsBlock.h               | 1 +
- src/runtime_src/tools/xclbinutil/XclBinSignature.h               | 1 +
- src/runtime_src/xdp/profile/database/events/vtf_event.h          | 1 +
- src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h  | 1 +
- src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h           | 1 +
- 10 files changed, 10 insertions(+)
-
-diff --git a/src/runtime_src/core/common/time.h b/src/runtime_src/core/common/time.h
-index a4a96b11d..585d38756 100644
---- a/src/runtime_src/core/common/time.h
-+++ b/src/runtime_src/core/common/time.h
-@@ -19,6 +19,7 @@
- 
- #include "core/common/config.h"
- #include <string>
-+#include <cstdint>
- 
- namespace xrt_core {
- 
-diff --git a/src/runtime_src/core/edge/common/aie_parser.h b/src/runtime_src/core/edge/common/aie_parser.h
-index 5bc32a36a..f35e97ecd 100644
---- a/src/runtime_src/core/edge/common/aie_parser.h
-+++ b/src/runtime_src/core/edge/common/aie_parser.h
-@@ -20,6 +20,7 @@
- #include <string>
- #include <vector>
- #include <unordered_map>
-+#include <cstdint>
- #include "../user/aie/common_layer/adf_api_config.h"
- 
- namespace xrt_core {
-diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-index 196304765..36ce35e80 100755
---- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
-@@ -18,6 +18,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- namespace adf
- {
-diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
-index 6fe36c615..2abd7473b 100644
---- a/src/runtime_src/core/edge/user/zynq_dev.h
-+++ b/src/runtime_src/core/edge/user/zynq_dev.h
-@@ -19,6 +19,7 @@
- #include <fstream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- class zynq_device {
- public:
-diff --git a/src/runtime_src/tools/xclbinutil/CBOR.h b/src/runtime_src/tools/xclbinutil/CBOR.h
-index 368459f59..acbf6ebae 100644
---- a/src/runtime_src/tools/xclbinutil/CBOR.h
-+++ b/src/runtime_src/tools/xclbinutil/CBOR.h
-@@ -22,6 +22,7 @@
- // #includes here - please keep these to a bare minimum!
- #include <string>
- #include <sstream>
-+#include <cstdint>
- 
- // ------------ F O R W A R D - D E C L A R A T I O N S ----------------------
- // Forward declarations - use these instead whenever possible...
-diff --git a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-index 361015962..2ec16360d 100644
---- a/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-+++ b/src/runtime_src/tools/xclbinutil/DTCStringsBlock.h
-@@ -20,6 +20,7 @@
- // ----------------------- I N C L U D E S -----------------------------------
- #include <sstream>
- #include <string>
-+#include <cstdint>
- 
- // ----------- C L A S S :   D T C S t r i n g s B l o c k -------------------
- 
-diff --git a/src/runtime_src/tools/xclbinutil/XclBinSignature.h b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-index b19ab56a4..f1b72d4d2 100644
---- a/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-+++ b/src/runtime_src/tools/xclbinutil/XclBinSignature.h
-@@ -18,6 +18,7 @@
- #define __XclBinSignature_h_
- 
- #include <string>
-+#include <cstdint>
- 
- // ----------------------- I N C L U D E S -----------------------------------
- 
-diff --git a/src/runtime_src/xdp/profile/database/events/vtf_event.h b/src/runtime_src/xdp/profile/database/events/vtf_event.h
-index 24a755a9a..a46a43e9d 100644
---- a/src/runtime_src/xdp/profile/database/events/vtf_event.h
-+++ b/src/runtime_src/xdp/profile/database/events/vtf_event.h
-@@ -18,6 +18,7 @@
- #define VTF_EVENT_DOT_H
- 
- #include <fstream>
-+#include <cstdint>
- 
- #include "xdp/config.h"
- 
-diff --git a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-index 98c57de2e..6f67c43df 100644
---- a/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-+++ b/src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h
-@@ -18,6 +18,7 @@
- #define XDP_PROFILE_AIE_TRACE_LOGGER_H
- 
- #include<iostream>
-+#include<cstdint>
- 
- namespace xdp {
- 
-diff --git a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-index a88597464..f392ec0e6 100644
---- a/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-+++ b/src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h
-@@ -19,6 +19,7 @@
- 
- #include <fstream>
- #include <string>
-+#include <cstdint>
- 
- #include "xdp/config.h"
- 
--- 
-2.34.1
-
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
deleted file mode 100644
index 49cfa228..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) libraries"
-DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
-
-require xrt-${PV}.inc
-
-SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
-
-LICENSE = "GPL-2.0-or-later & Apache-2.0"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
-                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
-                    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \
-                    file://runtime_src/core/edge/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 "
-
-S = "${UNPACKDIR}/git/src"
-
-inherit cmake pkgconfig
-
-BBCLASSEXTEND = "native nativesdk"
-
-# util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
-
-EXTRA_OECMAKE += " \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
-                "
-# Systems with AIE also require libmetal, this is implemented in the dynamic-layers
-# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend
-# Note: If meta-openamp is not available, AIE will not be enabled.
-
-EXTRA_OECMAKE:append:aarch64 = " -DXRT_LIBDFX=true"
-DEPENDS:append:aarch64 = " libdfx"
-
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "\
-    ${libdir}/lib*.so \
-    ${libdir}/lib*.so.* \
-    ${libdir}/ps_kernels_lib \
-    /lib/*.so* "
-INSANE_SKIP:${PN} += "dev-so"
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
-        echo "INFO: Creating ICD entry for Xilinx Platform"
-        mkdir -p /etc/OpenCL/vendors
-        echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd
-        chmod -R 755 /etc/OpenCL
-  fi
-}
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
deleted file mode 100644
index f686a746..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) libraries"
-DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
-
-require xrt-${PV}.inc
-
-SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
-
-LICENSE = "GPL-2.0-or-later & Apache-2.0"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
-                    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
-                    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 "
-
-S = "${UNPACKDIR}/git/src"
-
-inherit cmake pkgconfig
-
-BBCLASSEXTEND = "native nativesdk"
-
-# util-linux is for libuuid-dev.
-DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
-
-EXTRA_OECMAKE += " \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
-                "
-# Systems with AIE also require libmetal, this is implemented in the dynamic-layers
-# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend
-# Note: If meta-openamp is not available, AIE will not be enabled.
-
-EXTRA_OECMAKE:append:aarch64 = " -DXRT_LIBDFX=true"
-DEPENDS:append:aarch64 = " libdfx"
-
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "\
-    ${libdir}/lib*.so \
-    ${libdir}/lib*.so.* \
-    ${libdir}/ps_kernels_lib \
-    /lib/*.so* \
-    ${datadir}"
-INSANE_SKIP:${PN} += "dev-so"
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
-        echo "INFO: Creating ICD entry for Xilinx Platform"
-        mkdir -p /etc/OpenCL/vendors
-        echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd
-        chmod -R 755 /etc/OpenCL
-  fi
-}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
deleted file mode 100644
index 464b96fd..00000000
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) driver module"
-DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
-
-
-require recipes-xrt/xrt/xrt-${PV}.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
-LICENSE = "GPLv2 & Apache-2.0"
-
-# Temporary fix
-# Patch is applied as -p 4 to the src/runtime_src/core/edge directory
-SRC_URI += "file://0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch;striplevel=5;patchdir=./../../"
-
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
-
-inherit module
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  echo "Unloading old XRT Linux kernel modules"
-  ( rmmod zocl || true ) > /dev/null 2>&1
-  echo "Loading new XRT Linux kernel modules"
-  modprobe zocl
-}
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
deleted file mode 100644
index 7643b42a..00000000
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY  = "Xilinx Runtime(XRT) driver module"
-DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
-
-COMPATIBLE_MACHINE:microblaze = "none"
-
-require recipes-xrt/xrt/xrt-${PV}.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
-LICENSE = "GPL-2.0-or-later & Apache-2.0"
-
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
-
-inherit module
-
-pkg_postinst_ontarget:${PN}() {
-  #!/bin/sh
-  echo "Unloading old XRT Linux kernel modules"
-  ( rmmod zocl || true ) > /dev/null 2>&1
-  echo "Loading new XRT Linux kernel modules"
-  modprobe zocl
-}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-versal_fw-Fixup-core-makefiles.patch
deleted file mode 100644
index e49bc259..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0f117593c792fbe7cfddf7b84e5342b640c2716b Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Mon, 13 Sep 2021 14:02:45 -0700
-Subject: [PATCH] versal_fw: Fixup core makefiles
-
-The Yocto Project build environment needs to be able to override a few
-additional variables that may not be appropriate to do on the regular
-command line build version.  This Yocto Project specific will allow this
-behavior.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- lib/sw_apps/versal_plm/misc/Makefile   | 6 ++++--
- lib/sw_apps/versal_psmfw/misc/Makefile | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/lib/sw_apps/versal_plm/misc/Makefile b/lib/sw_apps/versal_plm/misc/Makefile
-index d1be4ffc8e..c7dc1a3dbe 100644
---- a/lib/sw_apps/versal_plm/misc/Makefile
-+++ b/lib/sw_apps/versal_plm/misc/Makefile
-@@ -2,6 +2,8 @@
- COMPILER := mb-gcc
- ARCHIVER := mb-gcc-ar
- ASSEMBLER := mb-as
-+COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-+EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects
- DRIVER_LIB_VERSION = 1.0
- PROCESSOR = psv_pmc_0
- LIBRARIES = ${PROCESSOR}/lib/libxil.a
-@@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
- 
- %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
-        @echo "Running Make include in $(subst /make.include,,$@)"
--       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.libs: include
-        @echo "Running Make libs in $(subst /make.libs,,$@)"
--       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.clean: 
-        $(MAKE) -C $(subst /make.clean,,$@) -s clean 
-diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile
-index 02d85e492e..f6386dcbed 100644
---- a/lib/sw_apps/versal_psmfw/misc/Makefile
-+++ b/lib/sw_apps/versal_psmfw/misc/Makefile
-@@ -11,6 +11,8 @@ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES))
- COMPILER := mb-gcc
- ARCHIVER := mb-ar
- ASSEMBLER := mb-as
-+COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-+EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra
- 
- ifneq (,$(findstring win,$(RDI_PLATFORM)))
-  SHELL = CMD
-@@ -41,11 +43,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
- 
- %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
-        @echo "Running Make include in $(subst /make.include,,$@)"
--       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
-+       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.libs: include
-        @echo "Running Make libs in $(subst /make.libs,,$@)"
--       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
-+       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.clean:
-        $(MAKE) -C $(subst /make.clean,,$@) -s clean
--- 
-2.17.1
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch
deleted file mode 100644
index 61fcf5a9..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3cd9d41953ebfe26d09dae231e7b7a0b3285be8d Mon Sep 17 00:00:00 2001
-From: Jesus De Haro <jesus.de-haro@xilinx.com>
-Date: Mon, 16 Jan 2023 20:59:06 -0800
-Subject: [PATCH] xilpm: versal: Fixed 2023.1 compile error
-
-Added NULL check for pointer Device before attempting to dereference the pointer.
-
-Signed-off-by: Jesus De Haro <jesus.de-haro@xilinx.com>
-Acked-by: Nicole Baze <nicole.baze@xilinx.com>
-(cherry picked from commit 2601b201e95ea0edab89342ee7137c74e88a8a79)
-
-Backported to 2022.1
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c b/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-index 13410f2224..f4743cc2a9 100644
---- a/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-+++ b/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-@@ -1,5 +1,6 @@
- /******************************************************************************
- * Copyright (c) 2018 - 2020 Xilinx, Inc.  All rights reserved.
-+* Copyright 2022-2023 Advanced Micro Devices, Inc. All Rights Reserved.
- * SPDX-License-Identifier: MIT
- ******************************************************************************/
- 
-@@ -696,7 +697,11 @@ XStatus XPmDomainIso_Control(u32 IsoIdx, u32 Enable)
- done:
-        if ((IsoIdx <= (u32)XPM_NODEIDX_ISO_XRAM_PL_FABRIC) &&
-                (IsoIdx >= (u32)XPM_NODEIDX_ISO_XRAM_PL_AXI0)) {
--               XPmPsLpDomain_LockPcsr(Device->Node.BaseAddress);
-+               if(NULL != Device) {
-+                       XPmPsLpDomain_LockPcsr(Device->Node.BaseAddress);
-+               } else {
-+                       Status = XST_DEVICE_NOT_FOUND;
-+               }
-        }
- 
-        return Status;
--- 
-2.34.1
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/makefile-skip-copy_bsp.sh.patch
deleted file mode 100644
index 5b9cc71b..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.1+git/makefile-skip-copy_bsp.sh.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Prevent makefile from calling copy_bsp.sh
-
-If we call copy_bsp.sh we will undo any manual compliation steps we
-have already done.  Avoid this.
-
-YP integration specific
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-
-diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile
-index 1750c0a329..17f6a545ea 100644
---- a/lib/sw_apps/zynqmp_pmufw/src/Makefile
-+++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile
-@@ -28,8 +28,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../misc/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../misc/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../misc/zynqmp_pmufw_bsp
- 
-diff --git a/lib/sw_apps/versal_plm/src/Makefile b/lib/sw_apps/versal_plm/src/Makefile
-index b4536e8584..a8643ecd47 100644
---- a/lib/sw_apps/versal_plm/src/Makefile
-+++ b/lib/sw_apps/versal_plm/src/Makefile
-@@ -30,8 +30,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../misc/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../misc/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../misc/versal_plm_bsp
- 
-diff --git a/lib/sw_apps/versal_psmfw/src/Makefile b/lib/sw_apps/versal_psmfw/src/Makefile
-index fdfee0a092..1ed664114b 100644
---- a/lib/sw_apps/versal_psmfw/src/Makefile
-+++ b/lib/sw_apps/versal_psmfw/src/Makefile
-@@ -29,8 +29,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../misc/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../misc/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../misc/versal_psmfw_bsp
- 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-versal_fw-Fixup-core-makefiles.patch
deleted file mode 100644
index d6cb0e38..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 607322dafb2979affd329ea70a2a7952203188a4 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Wed, 7 Dec 2022 15:42:15 -0800
-Subject: [PATCH] versal_fw: Fixup core makefiles
-
-The Yocto Project build environment needs to be able to override a few
-additional variables that may not be appropriate to do on the regular
-command line build version.  This patch preserves the default while
-allowing it to be overriden as necessary.
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- lib/sw_apps/versal_plm/misc/versal/Makefile     | 6 ++++--
- lib/sw_apps/versal_plm/misc/versal_net/Makefile | 6 ++++--
- lib/sw_apps/versal_psmfw/misc/Makefile          | 6 ++++--
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/lib/sw_apps/versal_plm/misc/versal/Makefile b/lib/sw_apps/versal_plm/misc/versal/Makefile
-index 5c8e719e9c..af070716b6 100644
---- a/lib/sw_apps/versal_plm/misc/versal/Makefile
-+++ b/lib/sw_apps/versal_plm/misc/versal/Makefile
-@@ -2,6 +2,8 @@
- COMPILER := mb-gcc
- ARCHIVER := mb-gcc-ar
- ASSEMBLER := mb-as
-+COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-+EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects
- DRIVER_LIB_VERSION = 1.0
- PROCESSOR = psv_pmc_0
- LIBRARIES = ${PROCESSOR}/lib/libxil.a
-@@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
- 
- %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
-        @echo "Running Make include in $(subst /make.include,,$@)"
--       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.libs: include
-        @echo "Running Make libs in $(subst /make.libs,,$@)"
--       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.clean:
-        $(MAKE) -C $(subst /make.clean,,$@) -s clean
-diff --git a/lib/sw_apps/versal_plm/misc/versal_net/Makefile b/lib/sw_apps/versal_plm/misc/versal_net/Makefile
-index abffa6c5ed..4af5a02001 100644
---- a/lib/sw_apps/versal_plm/misc/versal_net/Makefile
-+++ b/lib/sw_apps/versal_plm/misc/versal_net/Makefile
-@@ -2,6 +2,8 @@
- COMPILER := mb-gcc
- ARCHIVER := mb-gcc-ar
- ASSEMBLER := mb-as
-+COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-+EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects
- DRIVER_LIB_VERSION = 1.0
- PROCESSOR = psx_pmc_0
- LIBRARIES = ${PROCESSOR}/lib/libxil.a
-@@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
- 
- %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
-        @echo "Running Make include in $(subst /make.include,,$@)"
--       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.libs: include
-        @echo "Running Make libs in $(subst /make.libs,,$@)"
--       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-+       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.clean:
-        $(MAKE) -C $(subst /make.clean,,$@) -s clean
-diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile
-index 02d85e492e..f6386dcbed 100644
---- a/lib/sw_apps/versal_psmfw/misc/Makefile
-+++ b/lib/sw_apps/versal_psmfw/misc/Makefile
-@@ -11,6 +11,8 @@ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES))
- COMPILER := mb-gcc
- ARCHIVER := mb-ar
- ASSEMBLER := mb-as
-+COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-+EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra
- 
- ifneq (,$(findstring win,$(RDI_PLATFORM)))
-  SHELL = CMD
-@@ -41,11 +43,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
- 
- %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
-        @echo "Running Make include in $(subst /make.include,,$@)"
--       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
-+       $(MAKE) -C $(subst /make.include,,$@) -s include  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.libs: include
-        @echo "Running Make libs in $(subst /make.libs,,$@)"
--       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=  -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
-+       $(MAKE) -C $(subst /make.libs,,$@) -s libs  "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)"
- 
- %/make.clean:
-        $(MAKE) -C $(subst /make.clean,,$@) -s clean
--- 
-2.17.1
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch
deleted file mode 100644
index 3afa125c..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/0001-xilpm-versal-Fixed-2023.1-compile-error.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2601b201e95ea0edab89342ee7137c74e88a8a79 Mon Sep 17 00:00:00 2001
-From: Jesus De Haro <jesus.de-haro@xilinx.com>
-Date: Mon, 16 Jan 2023 20:59:06 -0800
-Subject: [PATCH] xilpm: versal: Fixed 2023.1 compile error
-
-Added NULL check for pointer Device before attempting to dereference the pointer.
-
-Signed-off-by: Jesus De Haro <jesus.de-haro@xilinx.com>
-Acked-by: Nicole Baze <nicole.baze@xilinx.com>
----
- lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c b/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-index fa571e0552..bd0aa89e12 100644
---- a/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-+++ b/lib/sw_services/xilpm/src/versal/server/xpm_domain_iso.c
-@@ -1,5 +1,6 @@
- /******************************************************************************
- * Copyright (c) 2018 - 2022 Xilinx, Inc.  All rights reserved.
-+* Copyright 2022-2023 Advanced Micro Devices, Inc. All Rights Reserved.
- * SPDX-License-Identifier: MIT
- ******************************************************************************/
- 
-@@ -721,7 +722,11 @@ XStatus XPmDomainIso_Control(u32 IsoIdx, u32 Enable)
- done:
-        if ((IsoIdx <= (u32)XPM_NODEIDX_ISO_XRAM_PL_FABRIC) &&
-                (IsoIdx >= (u32)XPM_NODEIDX_ISO_XRAM_PL_AXI0)) {
--               XPm_LockPcsr(Device->Node.BaseAddress);
-+               if(NULL != Device) {
-+                       XPm_LockPcsr(Device->Node.BaseAddress);
-+               } else {
-+                       Status = XST_DEVICE_NOT_FOUND;
-+               }
-        }
- 
-        return Status;
--- 
-2.34.1
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/makefile-skip-copy_bsp.sh.patch
deleted file mode 100644
index 1300c7e1..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2+git/makefile-skip-copy_bsp.sh.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From d703670357546d9aab66baea1f6751ba1cbdf7ad Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Wed, 7 Dec 2022 15:30:23 -0800
-Subject: [PATCH] Prevent makefile from calling copy_bsp.sh
-
-If we call copy_bsp.sh we will undo any manual compliation steps we
-have already done.  Avoid this.
-
-YP integration specific
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- lib/sw_apps/versal_plm/src/versal/Makefile       | 4 ++--
- lib/sw_apps/versal_plm/src/versal_net/Makefile   | 4 ++--
- lib/sw_apps/versal_psmfw/src/versal/Makefile     | 4 ++--
- lib/sw_apps/versal_psmfw/src/versal_net/Makefile | 6 +++---
- lib/sw_apps/zynqmp_pmufw/src/Makefile            | 4 ++--
- 5 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/lib/sw_apps/versal_plm/src/versal/Makefile b/lib/sw_apps/versal_plm/src/versal/Makefile
-index d1ebd1d374..bfb8c83adb 100644
---- a/lib/sw_apps/versal_plm/src/versal/Makefile
-+++ b/lib/sw_apps/versal_plm/src/versal/Makefile
-@@ -32,8 +32,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../../misc/versal/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../../misc/versal/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../../misc/versal/versal_plm_bsp
- 
-diff --git a/lib/sw_apps/versal_plm/src/versal_net/Makefile b/lib/sw_apps/versal_plm/src/versal_net/Makefile
-index 39c7aa38e3..081d8f1b2e 100644
---- a/lib/sw_apps/versal_plm/src/versal_net/Makefile
-+++ b/lib/sw_apps/versal_plm/src/versal_net/Makefile
-@@ -32,8 +32,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../../misc/versal_net/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../../misc/versal_net/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../../misc/versal_net/versal_plm_bsp
- 
-diff --git a/lib/sw_apps/versal_psmfw/src/versal/Makefile b/lib/sw_apps/versal_psmfw/src/versal/Makefile
-index 1572bbbca9..ce182acaa7 100644
---- a/lib/sw_apps/versal_psmfw/src/versal/Makefile
-+++ b/lib/sw_apps/versal_psmfw/src/versal/Makefile
-@@ -34,8 +34,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../../misc/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../../misc/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../../misc/versal_psmfw_bsp
- 
-diff --git a/lib/sw_apps/versal_psmfw/src/versal_net/Makefile b/lib/sw_apps/versal_psmfw/src/versal_net/Makefile
-index a72ffa1de2..3670310daa 100644
---- a/lib/sw_apps/versal_psmfw/src/versal_net/Makefile
-+++ b/lib/sw_apps/versal_psmfw/src/versal_net/Makefile
-@@ -34,8 +34,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../../misc/versal_net/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../../misc/versal_net/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../../misc/versal_net/versal_psmfw_bsp
- 
-@@ -44,4 +44,4 @@ $(LIBS):
- 
- clean:
-        rm -rf $(OBJS) $(LIBS) $(EXEC) *.o *.d ../common/*.o ../common/*.d
--       rm -rf ../../misc/versal_net/versal_psmfw_bsp
-\ No newline at end of file
-+       rm -rf ../../misc/versal_net/versal_psmfw_bsp
-diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile
-index 1750c0a329..17f6a545ea 100644
---- a/lib/sw_apps/zynqmp_pmufw/src/Makefile
-+++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile
-@@ -28,8 +28,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
-        $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
- 
- $(LIBS):
--       echo "Copying BSP files"
--       ../misc/copy_bsp.sh
-+       #echo "Copying BSP files"
-+       #../misc/copy_bsp.sh
-        echo "Compiling bsp"
-        $(MAKE) -C ../misc/zynqmp_pmufw_bsp
- 
--- 
-2.17.1
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1+git-generic.inc
deleted file mode 100644
index 42c9581e..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1+git-generic.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SKIP_MSG = ""
-SKIP_MSG:zynq = "Generic support for zynq is not available"
-SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
-
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://fsbl-fixups.patch \
-           "
-
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
deleted file mode 100644
index 3c57ee8c..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require fsbl-firmware.inc
-require ${@'fsbl-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'fsbl-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2+git-generic.inc
deleted file mode 100644
index 7a0a35da..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2+git-generic.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SKIP_MSG = ""
-SKIP_MSG:zynq = "Generic support for zynq is not available"
-SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
-
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://fsbl-fixups.patch \
-           "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb
deleted file mode 100644
index 3c57ee8c..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require fsbl-firmware.inc
-require ${@'fsbl-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'fsbl-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1+git-generic.inc
deleted file mode 100644
index e91ea607..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1+git-generic.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-xilpm-versal-Fixed-2023.1-compile-error.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-
-do_compile() {
-    oe_runmake
-
-    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
-}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
deleted file mode 100644
index d945aa26..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require plm-firmware.inc
-require ${@'plm-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'plm-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2+git-generic.inc
deleted file mode 100644
index d4d91baf..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2+git-generic.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Separate build directories for versal and versal-net
-SOC_DIR = "versal"
-SOC_DIR:versal-net = "versal_net"
-B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
-
-BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
-
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-xilpm-versal-Fixed-2023.1-compile-error.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
-
-do_configure() {
-    # manually do the copy_bsp step first, so as to be able to fix up use of
-    # mb-* commands
-    ${B}/../../misc/${SOC_DIR}/copy_bsp.sh
-}
-
-do_compile() {
-    oe_runmake
-
-    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
-}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb
deleted file mode 100644
index d945aa26..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require plm-firmware.inc
-require ${@'plm-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'plm-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1+git-generic.inc
deleted file mode 100644
index 8defde17..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1+git-generic.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
deleted file mode 100644
index 3ec0c10f..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require pmu-firmware.inc
-require ${@'pmu-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'pmu-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2+git-generic.inc
deleted file mode 100644
index 8defde17..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2+git-generic.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb
deleted file mode 100644
index 3ec0c10f..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require pmu-firmware.inc
-require ${@'pmu-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'pmu-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1+git-generic.inc
deleted file mode 100644
index 25e2f47f..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1+git-generic.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-xilpm-versal-Fixed-2023.1-compile-error.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
-
-do_compile() {
-    oe_runmake
-
-    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
-}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb
deleted file mode 100644
index ffa0a596..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require psm-firmware.inc
-require ${@'psm-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'psm-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2+git-generic.inc
deleted file mode 100644
index 4c331510..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2+git-generic.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Separate build directories for versal and versal-net
-SOC_DIR = "versal"
-SOC_DIR:versal-net = "versal_net"
-B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
-
-BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
-
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://makefile-skip-copy_bsp.sh.patch \
-            file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-xilpm-versal-Fixed-2023.1-compile-error.patch \
-           "
-
-EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
-
-# Override default since we're in a subdirectory deeper now...
-do_configure() {
-    # manually do the copy_bsp step first, so as to be able to fix up use of
-    # mb-* commands
-    if [ ${SOC_DIR} != "versal" ]; then
-        ${B}/../../misc/${SOC_DIR}/copy_bsp.sh
-    else
-        ${B}/../../misc/copy_bsp.sh
-    fi
-}
-
-do_compile() {
-    oe_runmake
-
-    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
-}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb
deleted file mode 100644
index ffa0a596..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require psm-firmware.inc
-require ${@'psm-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
-require ${@'psm-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}