33 files changed, 545 insertions, 7 deletions

diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/freertos10-xilinx_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/freertos10-xilinx_2024.2.bb
new file mode 100644
index 00000000..22d7955e
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/freertos10-xilinx_2024.2.bb
@@ -0,0 +1,15 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/ThirdParty/bsp/freertos10_xilinx/src/"
+ESW_COMPONENT_NAME = "libfreertos.a"
+
+DEPENDS += "libxil xilstandalone  xiltimer"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/libxil_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/libxil_2024.2.bb
new file mode 100644
index 00000000..2eb08307
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/libxil_2024.2.bb
@@ -0,0 +1,55 @@
+inherit esw python3native features_check
+
+LIBXIL_CONFIG ??= ""
+include ${LIBXIL_CONFIG}
+
+# The python code allows us to use an include above, instead of require
+# as it enforces that the file will be available for inclusion.  It also
+# gives the user feedback if something isn't configured properly.
+python () {
+    libxil_cfg = d.getVar("LIBXIL_CONFIG")
+    if libxil_cfg:
+        bbpath = d.getVar('BBPATH')
+        libxil_path = bb.utils.which(bbpath, libxil_cfg)
+        if libxil_path:
+            return
+        else:
+            d.setVar('BB_DONT_CACHE', '1')
+            bb.parse.SkipRecipe("LIBXIL_CONFIG (%s) was not found." % libxil_cfg)
+    else:
+        d.setVar('BB_DONT_CACHE', '1')
+        raise bb.parse.SkipRecipe("No LIBXIL_CONFIG set.")
+}
+
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
+ESW_COMPONENT_NAME = "libxil.a"
+
+DEPENDS += "xilstandalone "
+MACHINE_FEATURES:remove = "aiengine dfeccf dfeequ dfemix dfeprach rfdc dfeofdm"
+REQUIRED_MACHINE_FEATURES = "${MACHINE_FEATURES}"
+PACKAGECONFIG ?= "${MACHINE_FEATURES}"
+
+do_compile() {
+   # Combines the .a archives produced by all of the dependent items
+   cd ${RECIPE_SYSROOT}/usr/lib/
+   echo create libxil.a > libxil.mri
+   for each in ${REQUIRED_MACHINE_FEATURES}; do
+     each=$(echo $each | sed 's/-/_/g')
+     if [ -e lib$each.a ]; then
+       echo addlib lib$each.a >> libxil.mri
+     fi
+   done
+   echo “save” >> libxil.mri
+   echo “end” >> libxil.mri
+   ${AR} -M <libxil.mri
+   cp libxil.a ${B}
+}
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0755  ${B}/${ESW_COMPONENT_NAME} ${D}${libdir}
+
+    # Install Spec files for consumers of BSP
+    install -d ${D}${includedir}
+    cp -rf  ${SPECFILE_PATH} ${D}${includedir}
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/lwip_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/lwip_2024.2.bb
new file mode 100644
index 00000000..e70dfa11
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/lwip_2024.2.bb
@@ -0,0 +1,34 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip220/src/"
+ESW_COMPONENT_NAME = "liblwip220.a"
+
+DEPENDS += "libxil"
+DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
+
+EXTRA_OECMAKE += "-Dlwip220_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip220_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip220_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip220_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip220_ipv6_enable=OFF"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip220_api_mode=SOCKET_API"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    install -m 0755 xtopology_g.c ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+do_install() {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    install -m 0755  ${B}/${ESW_COMPONENT_NAME} ${D}${libdir}
+    install -m 0644  ${B}/include/*.h ${D}${includedir}
+    cp -r ${B}/include/arch/ ${D}${includedir}
+    cp -r ${B}/include/include/lwip/ ${D}${includedir}
+    cp -r ${B}/include/netif/ ${D}${includedir}
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
index 0cef7d97..cae39d17 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
@@ -25,7 +25,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb
new file mode 100644
index 00000000..cae39d17
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb
@@ -0,0 +1,32 @@
+inherit esw deploy
+
+# Requires by dependency xilffs
+REQUIRED_MACHINE_FEATURES = "sdps"
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/examples/"
+
+DEPENDS += "xilffs xiltimer"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs_2024.2.bb
new file mode 100644
index 00000000..b7e0784a
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs_2024.2.bb
@@ -0,0 +1,13 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
+ESW_COMPONENT_NAME = "libxilffs.a"
+
+PACKAGECONFIG ??= "read_only word_access"
+PACKAGECONFIG[use_mkfs]   ="-DXILFFS_use_mkfs=ON,-DXILFFS_use_mkfs=OFF,,"
+PACKAGECONFIG[read_only]  ="-DXILFFS_read_only=ON,-DXILFFS_read_only=OFF,,"
+PACKAGECONFIG[word_access]="-DXILFFS_word_access=ON,-DXILFFS_word_access=OFF,,"
+
+EXTRA_OECMAKE += "${@'-DXILFFS_num_logical_vol=10 -DXILFFS_enable_multi_partition=ON' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
+
+DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
index a793fa86..a3fb1560 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
@@ -22,7 +22,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb
new file mode 100644
index 00000000..a3fb1560
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb
@@ -0,0 +1,29 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilfpga/examples/"
+
+DEPENDS += "xilfpga"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga_2024.2.bb
new file mode 100644
index 00000000..6eaf40ac
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga_2024.2.bb
@@ -0,0 +1,8 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilfpga/src/"
+ESW_COMPONENT_NAME = "libxilfpga.a"
+
+DEPENDS += "libxil xilsecure"
+DEPENDS += "libxil ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' else ''}"
+
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilloader_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilloader_2024.2.bb
new file mode 100644
index 00000000..4f01407e
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilloader_2024.2.bb
@@ -0,0 +1,9 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilloader/src/"
+ESW_COMPONENT_NAME = "libxilloader.a"
+
+#DEPENDS += "xilstandalone libxil xilpdi xilffs xilsecure xilpuf xilplmi"
+DEPENDS += "xilstandalone libxil xilpm xilpdi xilffs xilsecure xilpuf xilsem"
+
+DEPENDS += "cframe"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
index 518b24c3..600369ad 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
@@ -31,7 +31,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb
new file mode 100644
index 00000000..600369ad
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb
@@ -0,0 +1,38 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/examples/"
+
+DEPENDS += "xilmailbox"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_generate_eglist () {
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+}
+
+addtask generate_eglist before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox_2024.2.bb
new file mode 100644
index 00000000..77115515
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox_2024.2.bb
@@ -0,0 +1,15 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/src/"
+ESW_COMPONENT_NAME = "libxilmailbox.a"
+
+DEPENDS += "xilstandalone libxil xiltimer"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
index 9d91751c..bd001f64 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb
new file mode 100644
index 00000000..bd001f64
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb
@@ -0,0 +1,33 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILNVM_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILNVM_mode="server",,"
+
+DEPENDS += "xilnvm"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm_2024.2.bb
new file mode 100644
index 00000000..8aa1250d
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm_2024.2.bb
@@ -0,0 +1,10 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/src/"
+ESW_COMPONENT_NAME = "libxilnvm.a"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILNVM_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILNVM_mode="server",,"
+
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpdi_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpdi_2024.2.bb
new file mode 100644
index 00000000..c008b069
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpdi_2024.2.bb
@@ -0,0 +1,6 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilpdi/src/"
+ESW_COMPONENT_NAME = "libxilpdi.a"
+
+DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilplmi_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilplmi_2024.2.bb
new file mode 100644
index 00000000..cb3b7831
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilplmi_2024.2.bb
@@ -0,0 +1,6 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/"
+ESW_COMPONENT_NAME = "libxilplmi.a"
+
+DEPENDS += "xilstandalone libxil cfupmc xiltimer ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpm_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpm_2024.2.bb
new file mode 100644
index 00000000..ee6faa13
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpm_2024.2.bb
@@ -0,0 +1,38 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/"
+ESW_COMPONENT_NAME = "libxilpm.a"
+
+DEPENDS += "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
+
+def lopper_args(d):
+     lopper_cmd_append = ""
+     flags = [
+         "APU_AS_OVERLAY_CONFIG_MASTER",
+         "APU_AS_POWER_MANAGEMENT_MASTER",
+         "APU_AS_RESET_MANAGEMENT_MASTER",
+         "RPU0_AS_OVERLAY_CONFIG_MASTER",
+         "RPU0_AS_POWER_MANAGEMENT_MASTER",
+         "RPU0_AS_RESET_MANAGEMENT_MASTER",
+         "RPU1_AS_OVERLAY_CONFIG_MASTER",
+         "RPU1_AS_POWER_MANAGEMENT_MASTER",
+         "RPU1_AS_RESET_MANAGEMENT_MASTER"
+     ]
+
+     for flag in flags:
+         value = d.getVar("XILPM_" + flag)
+         if value:
+             lopper_cmd_append += "XILPM_" + flag.lower() + ":" + value.lower() + " "
+
+     return lopper_cmd_append
+
+LOPPER_CMD_APPEND = "${@lopper_args(d)}"
+
+do_configure:prepend:zynqmp() {
+    # This script should also not rely on relative paths and such
+    (
+        cd ${S}
+        lopper -f --enhanced --werror ${DTS_FILE} -- generate_config_object pm_cfg_obj.c ${ESW_MACHINE} ${LOPPER_CMD_APPEND}
+        install -m 0755 pm_cfg_obj.c ${S}/${ESW_COMPONENT_SRC}/zynqmp/client/common/
+    )
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
index 114449e9..bbe2920b 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb
new file mode 100644
index 00000000..bbe2920b
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb
@@ -0,0 +1,33 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/examples/"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILPUF_Mode="client",,"
+PACKAGECONFIG[server]  ="-DXILPUF_Mode="server",,"
+
+DEPENDS += "xilpuf xilsecure xilmailbox xilnvm xilplmi"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf_2024.2.bb
new file mode 100644
index 00000000..84765a39
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf_2024.2.bb
@@ -0,0 +1,10 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/src/"
+ESW_COMPONENT_NAME = "libxilpuf.a"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILPUF_Mode="client",,"
+PACKAGECONFIG[server]  ="-DXILPUF_Mode="server",,"
+
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.1.bb
new file mode 100644
index 00000000..3337dce9
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.1.bb
@@ -0,0 +1,15 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilrsa/src/"
+ESW_COMPONENT_NAME = "libxilrsa.a"
+
+DEPENDS += "libxil"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.2.bb
new file mode 100644
index 00000000..3337dce9
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilrsa_2024.2.bb
@@ -0,0 +1,15 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilrsa/src/"
+ESW_COMPONENT_NAME = "libxilrsa.a"
+
+DEPENDS += "libxil"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
index a806c4ee..a2b4b7a5 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb
new file mode 100644
index 00000000..a2b4b7a5
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb
@@ -0,0 +1,33 @@
+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/examples/"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILSECURE_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILSECURE_mode="server",,"
+
+DEPENDS += "xilsecure"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure_2024.2.bb
new file mode 100644
index 00000000..be22ba90
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure_2024.2.bb
@@ -0,0 +1,14 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
+ESW_COMPONENT_NAME = "libxilsecure.a"
+
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILSECURE_mode="client",,"
+PACKAGECONFIG[server]  ="-DXILSECURE_mode="server",,"
+
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' or d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''} ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
+
+do_install:append() {
+    install -m 0755  ${B}/*.a ${D}${libdir}
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsem_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsem_2024.2.bb
new file mode 100644
index 00000000..3631d7f0
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsem_2024.2.bb
@@ -0,0 +1,6 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilsem/src/"
+ESW_COMPONENT_NAME = "libxilsem.a"
+
+DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
index 5702beaf..a42d6fd2 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
@@ -22,7 +22,7 @@ do_install() {
 

 do_deploy() {

     install -d ${DEPLOYDIR}/${BPN}/

-    install -Dm 0644 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

 }

 addtask deploy before do_build after do_package

 

diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb
new file mode 100644
index 00000000..a42d6fd2
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb
@@ -0,0 +1,29 @@
+inherit esw deploy

+

+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"

+

+DEPENDS += "xilskey xilsecure"

+

+do_configure:prepend() {

+    (

+    cd ${S}

+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}

+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/

+    )

+}

+

+ESW_CUSTOM_LINKER_FILE ?= "None"

+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"

+

+do_install() {

+    install -d ${D}/${base_libdir}/firmware

+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware

+}

+

+do_deploy() {

+    install -d ${DEPLOYDIR}/${BPN}/

+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

+}

+addtask deploy before do_build after do_package

+

+FILES:${PN} = "${base_libdir}/firmware/*.elf"

diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey_2024.2.bb
new file mode 100644
index 00000000..84782554
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey_2024.2.bb
@@ -0,0 +1,6 @@
+inherit esw
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/src/"
+ESW_COMPONENT_NAME = "libxilskey.a"
+
+DEPENDS += "libxil"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb
new file mode 100644
index 00000000..a4b0037b
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilstandalone_2024.2.bb
@@ -0,0 +1,21 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/lib/bsp/standalone/src/"
+ESW_COMPONENT_NAME = "libxilstandalone.a"
+
+DEPENDS += "libgloss"
+
+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/
+    )
+
+}
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xiltimer_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xiltimer_2024.2.bb
new file mode 100644
index 00000000..dd19671d
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xiltimer_2024.2.bb
@@ -0,0 +1,15 @@
+inherit esw python3native
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xiltimer/src/"
+ESW_COMPONENT_NAME = "libxiltimer.a"
+
+DEPENDS += "libxil"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}