various: Remove 2022.x versions

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

22 files changed, 0 insertions, 569 deletions

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 ''}