6 files changed, 56 insertions, 94 deletions

diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bb
deleted file mode 100644
index 25988eb9..00000000
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
-
-DEPENDS += "xilstandalone xiltimer xilffs xilpdi xilplmi xilloader xilpm xilsecure xilsem"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/versal_plm* ${D}/${base_libdir}/firmware
-}
-
-PLM_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PLM_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-
-do_deploy() {
-
-    # Not a huge fan of deploying from package but we want the stripped elf to be deployed.
-    # We could, technically create another task that runs after do_install that strips it but it
-    # seems unnecessarily convoluted, unless there's an objection on performing do_install we
-    # should do it this way since it easier to keep up with changes in oe-core.
-
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES_${PN} = "${base_libdir}/firmware/plm*"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
new file mode 100644
index 00000000..3d0ad6dd
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
@@ -0,0 +1,18 @@
+# Reset this
+SRC_URI = "${EMBEDDEDSW_SRCURI}"
+
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
+
+ESW_COMPONENT = "versal_plm.elf"
+
+do_compile_append() {
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/plm.bin
+}
+
+do_install() {
+    :
+}
+
+DEPENDS += "xilstandalone xiltimer xilffs xilpdi xilplmi xilloader xilpm xilsecure xilsem"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bb
deleted file mode 100644
index 19238f97..00000000
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-inherit esw deploy
-
-COMPATIBLE_MACHINE = "microblaze-pmu"
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
-
-DEPENDS += "xilstandalone xiltimer xilfpga xilskey"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/pmufw* ${D}/${base_libdir}/firmware
-}
-
-PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PMU_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-
-do_deploy() {
-
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/pmufw.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PMU_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/pmufw.elf ${WORKDIR}/package/${base_libdir}/firmware/pmufw.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/pmufw.bin ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES_${PN} = "${base_libdir}/firmware/pmufw*"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
new file mode 100644
index 00000000..086689f0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
@@ -0,0 +1,20 @@
+# Reset this
+SRC_URI = "${EMBEDDEDSW_SRCURI}"
+SRC_URI += "file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch"
+SRC_URI += "file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch"
+
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
+
+ESW_COMPONENT = "pmufw.elf"
+
+do_compile() {
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin
+}
+
+do_install() {
+    :
+}
+
+DEPENDS += "xilstandalone xiltimer xilfpga xilskey"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bb
deleted file mode 100644
index df8797ca..00000000
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit esw deploy
-
-ESW_COMPONENT_SRC = "/lib/sw_apps/versal_psmfw/src/"
-
-DEPENDS += "xilstandalone libxil xiltimer"
-
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/versal_psmfw* ${D}/${base_libdir}/firmware
-}
-
-PSM_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PSM_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-
-do_deploy() {
-
-    # Not a huge fan of deploying from package but we want the stripped elf to be deployed.
-    # We could, technically create another task that runs after do_install that strips it but it
-    # seems unnecessarily convoluted, unless there's an objection on performing do_install we
-    # should do it this way since it easier to keep up with changes in oe-core.
-
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_psmfw.elf ${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PSM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/versal_psmfw.elf ${WORKDIR}/package/${base_libdir}/firmware/versal_psmfw.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_psmfw.bin ${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PSM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-
-addtask deploy before do_build after do_package
-
-FILES_${PN} = "${base_libdir}/firmware/psmfw*"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
new file mode 100644
index 00000000..8108862e
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
@@ -0,0 +1,18 @@
+# Reset this
+SRC_URI = "${EMBEDDEDSW_SRCURI}"
+
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_apps/versal_psmfw/src/"
+
+ESW_COMPONENT = "versal_psmfw.elf"
+
+do_compile_append() {
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/psmfw.bin
+}
+
+do_install() {
+    :
+}
+
+DEPENDS += "xilstandalone libxil xiltimer"