48 files changed, 169 insertions, 158 deletions

diff --git a/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass b/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
index 644f3b49..7619c029 100644
--- a/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
+++ b/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
@@ -8,8 +8,6 @@ OECMAKE_ARGS:remove = "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
 
 SRCREV_FORMAT = "src_decouple"
 
-S = "${UNPACKDIR}/git"
-B = "${WORKDIR}/build"
 OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 LICFILENAME = "license.txt"
 
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index dbcbbc11..bd62913f 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
@@ -1,9 +1,6 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-S = "${UNPACKDIR}/git"
-B = "${WORKDIR}/build"
-
 INHIBIT_DEFAULT_DEPS = "1"
 
 # Installing this recipe should install the lopper tools and such
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
index dbcbbc11..bd62913f 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
@@ -1,9 +1,6 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-S = "${UNPACKDIR}/git"
-B = "${WORKDIR}/build"
-
 INHIBIT_DEFAULT_DEPS = "1"
 
 # Installing this recipe should install the lopper tools and such
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb
index a4b0037b..ac2064ff 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb
@@ -5,17 +5,16 @@ ESW_COMPONENT_NAME = "libxilstandalone.a"
 
 DEPENDS += "libgloss"
 
+S = "${B}"
+
 do_configure:prepend() {
     # This script should also not rely on relative paths and such
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/
-    install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}
-    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
-    install -m 0755 StandaloneExample.cmake ${S}/${ESW_COMPONENT_SRC}/common/
-    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
-    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/common/
-    )
+    lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${B}/${ESW_COMPONENT_SRC}
+    install -m 0755 MemConfig.cmake ${B}/${ESW_COMPONENT_SRC}/
+    install -m 0755 *.c ${B}/${ESW_COMPONENT_SRC}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${B}/${ESW_COMPONENT_SRC} hwcmake_metadata ${B}
+    install -m 0755 StandaloneExample.cmake ${B}/${ESW_COMPONENT_SRC}/common/
+    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${B}
+    install -m 0755 xparameters.h ${B}/${ESW_COMPONENT_SRC}/common/
 
 }
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 6a6faf01..805aa18d 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -35,7 +35,6 @@ LIC_FILES_CHKSUM[xlnx_rel_v2024.1] = '0dcabd3719e5ac33f7c03f0d77d473f2'
 LIC_FILES_CHKSUM[xlnx_rel_v2024.2] = '689662801a76c14d0cb57ae169cbec7c'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
-SRC_URI = "${EMBEDDEDSW_SRCURI}"
 PV .= "+git"
 
 python() {
@@ -47,3 +46,24 @@ python() {
         except:
             raise bb.parse.SkipRecipe('BB_NO_NETWORK is enabled, can not fetch SRCREV (%s)' % d.getVar('SRCREV'))
 }
+
+SHARED_S = "${TMPDIR}/work-shared/embeddedsw-${PV}-${PR}/source/git"
+S = "${WORKDIR}/source"
+B = "${WORKDIR}/build"
+
+ERROR_QA:remove = "buildpaths"
+
+# The following is for recipes that use the common sources
+python do_copy_shared_src() {
+    src = d.getVar('SHARED_S')
+    dest = d.getVar('S')
+    if src != dest:
+        oe.path.copyhardlinktree(src, dest)
+}
+
+python() {
+    if d.getVar('BPN') != "embeddedsw-source":
+        bb.build.addtask('do_copy_shared_src', 'do_configure do_populate_lic do_deploy_source_date_epoch', 'do_patch', d)
+
+        d.appendVarFlag('do_copy_shared_src', 'depends', ' embeddedsw-source-${PV}:do_patch')
+}
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 17b9430d..4fa4bfb6 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -3,7 +3,6 @@ DISTRO_VERSION = "1.0"
 TARGET_VENDOR = "-xilinx"
 
 TCLIBC = "newlib"
-TCLIBCAPPEND =""
 
 # Change SDK name
 SDK_VERSION = "xilinx-standalone"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc
new file mode 100644
index 00000000..3be268bf
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc
@@ -0,0 +1,33 @@
+deltask do_configure
+deltask do_compile
+deltask do_install
+deltask do_populate_sysroot
+deltask do_populate_lic
+RM_WORK_EXCLUDE += "${PN}"
+
+inherit xlnx-embeddedsw nopackages
+
+COMPATIBLE_HOST = ".*"
+COMPATIBLE_MACHINE = ".*"
+
+PN = "embeddedsw-source-${PV}"
+WORKDIR = "${TMPDIR}/work-shared/embeddedsw-${PV}-${PR}"
+SSTATE_SWSPEC = "sstate:embeddedsw::${PV}:${PR}::${SSTATE_VERSION}:"
+
+STAMP = "${STAMPS_DIR}/work-shared/embeddedsw-${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/work-shared/embeddedsw-${PV}-*"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+PACKAGES = ""
+TARGET_ARCH = "allarch"
+TARGET_AS_ARCH = "none"
+TARGET_CC_ARCH = "none"
+TARGET_LD_ARCH = "none"
+TARGET_OS = "linux"
+baselib = "lib"
+PACKAGE_ARCH = "all"
+
+UNPACKDIR = "${WORKDIR}/source"
+S = "${SHARED_S}"
+B = "${WORKDIR}/build"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb
@@ -0,0 +1,17 @@
+require recipes-bsp/embeddedsw/embeddedsw-source.inc
+
+
+BPN = "embeddedsw-source"
+EXCLUDE_FROM_WORLD = "1"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI = " \
+        ${EMBEDDEDSW_SRCURI} \
+        file://makefile-skip-copy_bsp.sh.patch \
+        file://fsbl-fixups.patch \
+        file://0001-versal_fw-Fixup-core-makefiles.patch \
+        "
+
+#       file://fix-xil-assert-filename.patch \
+#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb
@@ -0,0 +1,17 @@
+require recipes-bsp/embeddedsw/embeddedsw-source.inc
+
+
+BPN = "embeddedsw-source"
+EXCLUDE_FROM_WORLD = "1"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI = " \
+        ${EMBEDDEDSW_SRCURI} \
+        file://makefile-skip-copy_bsp.sh.patch \
+        file://fsbl-fixups.patch \
+        file://0001-versal_fw-Fixup-core-makefiles.patch \
+        "
+
+#       file://fix-xil-assert-filename.patch \
+#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb
@@ -0,0 +1,17 @@
+require recipes-bsp/embeddedsw/embeddedsw-source.inc
+
+
+BPN = "embeddedsw-source"
+EXCLUDE_FROM_WORLD = "1"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI = " \
+        ${EMBEDDEDSW_SRCURI} \
+        file://makefile-skip-copy_bsp.sh.patch \
+        file://fsbl-fixups.patch \
+        file://0001-versal_fw-Fixup-core-makefiles.patch \
+        "
+
+#       file://fix-xil-assert-filename.patch \
+#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
new file mode 100644
index 00000000..fe015bc2
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
@@ -0,0 +1,15 @@
+require recipes-bsp/embeddedsw/embeddedsw-source.inc
+
+
+BPN = "embeddedsw-source"
+EXCLUDE_FROM_WORLD = "1"
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI = " \
+        ${EMBEDDEDSW_SRCURI} \
+        file://fix-xil-assert-filename.patch \
+        file://makefile-skip-copy_bsp.sh.patch \
+        file://fsbl-fixups.patch \
+        file://0001-versal_fw-Fixup-core-makefiles.patch \
+        "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
index 788cfb35..0e96f4df 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ 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.
 
+Upstream-Status: Inappropriate [YP integration specific]
+
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  lib/sw_apps/versal_plm/misc/versal/Makefile     | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
index 1300c7e1..c1b9a5bd 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ 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
+Upstream-Status: Inappropriate [YP integration specific]
 
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
index 788cfb35..0e96f4df 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ 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.
 
+Upstream-Status: Inappropriate [YP integration specific]
+
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  lib/sw_apps/versal_plm/misc/versal/Makefile     | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ 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
+Upstream-Status: Inappropriate [YP integration specific]
 
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
index 4bc191c1..f3726714 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ 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.
 
+Upstream-Status: Inappropriate [YP integration specific]
+
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  lib/sw_apps/versal_plm/misc/versal/Makefile     | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ 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
+Upstream-Status: Inappropriate [YP integration specific]
 
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
index 4bc191c1..cbe0c4e5 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ 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.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  lib/sw_apps/versal_plm/misc/versal/Makefile     | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch
new file mode 100644
index 00000000..2f7af0e9
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch
@@ -0,0 +1,26 @@
+Fix __FILENAME__ definition
+
+This fixes the error:
+
+| <command-line>: error: passing argument 1 of 'Xil_Assert' makes pointer from integer without a cast [-Wint-conversion]
+| .../work-shared/embeddedsw-2024.2+git-r0/source/git/lib/bsp/standalone/src/common/xil_assert.h:123:20: note: in expansion of macro '__FILENAME__'
+|   123 |         Xil_Assert(__FILENAME__, __LINE__);            \
+|       |                    ^~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
+diff --git a/cmake/Findcommon.cmake b/cmake/Findcommon.cmake
+index c856d408fb..acac2e8fcc 100644
+--- a/cmake/Findcommon.cmake
++++ b/cmake/Findcommon.cmake
+@@ -11,7 +11,7 @@ endif()
+ if("${CMAKE_HOST_NAME}" STREQUAL "Linux")
+     add_compile_options("-D__FILENAME__=\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"")
+ else()
+-    add_compile_options("-D__FILENAME__='__FILE__'")
++    add_compile_options("-D__FILENAME__=__FILE__")
+ endif()
+ set (CMAKE_INSTALL_LIBDIR "lib")
+ function (collector_create name base)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ 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
+Upstream-Status: Inappropriate [YP integration specific]
 
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
index 2c3b4e67..83fe4d2a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: git/lib/sw_apps/zynqmp_fsbl/misc/makefile
 ===================================================================
 --- git.orig/lib/sw_apps/zynqmp_fsbl/misc/makefile
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 5b2e123f..c600128a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
@@ -9,8 +9,6 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${UNPACKDIR}/git"
-
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 FSBL_IMAGE_NAME ??= "fsbl-${MACHINE}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
@@ -1,10 +1,3 @@
 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_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
@@ -1,10 +1,3 @@
 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_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
@@ -1,10 +1,3 @@
 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_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
@@ -1,10 +1,3 @@
 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/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 2a00afac..7654b28f 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -10,8 +10,6 @@ COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${UNPACKDIR}/git"
-
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PLM_IMAGE_NAME ??= "plm-${MACHINE}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
 do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
 do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
 do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
 do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index e821c05d..a6f39acf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -8,8 +8,6 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${UNPACKDIR}/git"
-
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
index 8defde17..fc6f9fcf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
@@ -1,8 +1 @@
-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_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
index 8defde17..fc6f9fcf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
@@ -1,8 +1 @@
-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_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
index 935f6e32..d5850ba3 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
@@ -1,8 +1 @@
-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 ${ESW_CFLAGS}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
index 935f6e32..d5850ba3 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
@@ -1,8 +1 @@
-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 ${ESW_CFLAGS}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 2bdb17ed..7957c6d6 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -10,8 +10,6 @@ COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${UNPACKDIR}/git"
-
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
 
 # Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
 
 # Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
 
 # Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
@@ -5,13 +5,6 @@ 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 \
-           "
-
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
 
 # Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
index 2efbfd31..db376e41 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
index e2a73c39..339138e6 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
index d15beb53..75283e50 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
index a1e51216..0adf4f96 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
index ec6e35d0..de5e5f11 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
index 5de31f05..28c7ee35 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
@@ -7,8 +7,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PROVIDES = "librfclk"
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
index d638af27..b426cf58 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${UNPACKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libmetal"