meta-xilinx-standalone: embeddedsw: Correct 2024.2 pmufw patch

The commit:
  commit 4b39c6111b965ddd43b899302f9f41d49cec47c4
  Author: Jonathan Stroud <jonathan.stroud@amd.com>
  Date:   Wed Jan 15 16:31:24 2025 -0700

    Backport pmufw fix to 2024.2 that fixes a bug in GEM IO register mapping

    PMU FW has a bug that stomps on the MIO registers when intializing GEM.
    Backport this patch from master to 2024.2 builds

was applied incorrectly due to recent changes in the way the
software was being patched.  Correct this and match the current
embeddedsw-source implementation.

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

3 files changed, 1 insertions, 6 deletions

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
index fe015bc2..2d401034 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
@@ -12,4 +12,5 @@ SRC_URI = " \
         file://makefile-skip-copy_bsp.sh.patch \
         file://fsbl-fixups.patch \
         file://0001-versal_fw-Fixup-core-makefiles.patch \
+        file://0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch \
         "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc
deleted file mode 100644
index de8e4a25..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
-
-SRC_URI += " \
-            file://0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch \
-           "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
index 07c44b6a..3ec0c10f 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
@@ -1,4 +1,3 @@
 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 ''}
-require ${@'pmu-firmware_${PV}-xsct.inc' if d.getVar('XILINX_WITH_ESW') == 'xsct' else ''}