270 files changed, 1437 insertions, 2192 deletions
diff --git a/meta-xilinx-standalone-experimental/README.md b/meta-xilinx-standalone-experimental/README.md
index 31aa0f63..950e4e12 100644
--- a/meta-xilinx-standalone-experimental/README.md
+++ b/meta-xilinx-standalone-experimental/README.md
@@ -1,44 +1,150 @@
 # meta-xilinx-standalone-experimental
-This layer contains experimental items that may eventually be added
+This layer contains experimental items that may eventually be added to the
-to the meta-xilinx-standalone layer.  The components in this layer
+meta-xilinx-standalone layer.  The components in this layer may or may not be
-may or may not be buildable as they may require unreleased code.
+buildable as they may require unreleased code.
-The non-Linux software components are still in development and
+The non-Linux software components are still in development and this should be
-this should be considered to be a preview release only.  For instance,
+considered to be a preview release only.  For instance, some components may not
-some components may not be buildable, expect APIs to change on various
+be buildable, expect APIs to change on various parts and pieces.
-parts and pieces.
 ## Build Instructions
-**Note:** to use this layer you must REMOVE meta-xilinx-tools from your
+> **Note:**
-project.  meta-xilinx-tools is not compatible with this experimental
+> * To use this layer you must REMOVE meta-xilinx-tools from your project.
-approach.  You may also have to remove other layers that depend
+meta-xilinx-tools is not compatible with this experimental approach. You may
-on meta-xilinx-tools, such as meta-kria and meta-system-controller.
+also have to remove other layers that depend on meta-xilinx-tools, such as
+meta-kria and meta-system-controller.
+> * To use the experimental version of the embedded software (firmware) as well
+as system configuration, you must build through gen-machineconf tool. This tool
+is passed a output of system device tree directory.
-To use the experimental version of the embedded software (firmware)
+The Yocto Project setup for the System Device Tree (SDT) workflow is as follows.
-as well as system configuration, you must build the 'meta-xilinx-setup'
+Be sure to read everything below.
-SDK.  This SDK is passed a device tree, constructed from System Device tree and
-produces a number of configuration files.
+1. Follow [Building Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.building.md)
+   upto step 4.
+2. Remove meta-xilinx-tools and meta-xilinx-tools dependency layers(such as
+   meta-kria and meta-system-controller if included in bblayers.conf), then add
+   the meta-xilinx-standalone-experimental layer.
+> **Note:** SDT builds for following devices are not supported in 2024.1 release.
+> * Zynq 7000
+> * MicoBlaze
+> * Kria
+> * System Controller
-1. Remove meta-xilinx-tools, meta-kria and meta-system-controller, then add the decoupling layer
 ```
 $ bitbake-layers remove-layer meta-xilinx-tools
 $ bitbake-layers remove-layer meta-kria
 $ bitbake-layers remove-layer meta-system-controller
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-standalone-experimental
 ```
-2. Build the setup SDK
+3. Export gen-machineconf tool.
+```
+$ export PATH=$PATH:<ABSOLUTE_PATH>/gen-machine-conf
+```
+4. Run the script from the build or ${TOPDIR} directory. This step describes
+   System Device Tree (SDT) with and without pl overlays. Configruations are same
+   for both SDT with and without pl overlays except for linux dts content.
+> **Note:**
+> 1. The -l option will automatically add the necessary parameters to the
+   local.conf file.  If you need to re-run this comment, you just clear the
+   parameters from the end of the file.  Without the -l option the items are
+   printed to the screen and must be manually added to your conf/local.conf
+> 2. The --soc-family argument is an optional argument and user can skip this.
+> 3. By default minimal set of multiconfigs are generated by gen-machineconf tool.
+>    To enable full multiconfig(APU/RPU baremetal or FreeRTOS) then use
+>    `--multiconfigfull` option.
+   a. Without SDT pl overlay:
+```
+ $ gen-machineconf --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf
+```
+   b. With SDT pl overlay:
+      To generate SDT pl overlay run gen-machineconf command with
+      `-g {full|dfx}` option. Once SDT pl overlay command is executed successfully
+      pl.dtsi will be generated under <conf>/dts/${MACHINE}/pl-overlay-{full|dfx}
+      directory. User can use this pl.dtsi as input to full or dfx static firmware
+      recipes.
+> **Note:** DFx partial dtsi is not processed by gen-machineconf(lopper) tool, User
+>          needs to use the *_partial.dtsi and *_partial.pdi/bit from sdtgen output
+>          artifacts to DFx partial firmware recipes.
+   * ZynqMP Full bitstream or Versal Segmented Configuration:
+```
+ $ gen-machineconf parse-sdt --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf -g full
+```
+   * ZynqMP or Versal DFx:
+```
+ $ gen-machineconf parse-sdt --hw-description <path_to_sdtgen_output_directory> -c <conf> -l conf/local.conf -g dfx
 ```
-$ bitbake meta-xilinx-setup
+For example, zynqmp:
+```
+$ gen-machineconf --soc-family zynqmp --hw-description <path_to_sdtgen_output_directory> -c conf/ -l conf/local.conf
+```
+The following will be written to the end of the conf/local.conf file:
+```
+# Use the newly generated MACHINE
+MACHINE = "xlnx-zynqmp-zcu102-rev1-0"
+# Avoid errors in some baremetal configs as these layers may be present
+# but are not used.  Note the following lines are optional and can be
+# safetly disabled.
+SKIP_META_VIRT_SANITY_CHECK = "1"
+SKIP_META_SECURITY_SANITY_CHECK = "1"
+SKIP_META_TPM_SANITY_CHECK = "1"
+# Each generated multiconfig defines it's own TMPDIR, either edit the
+# multiconfig files, or uncomment and adjust MC_TMPDIR_PREFIX below
+#MC_TMPDIR_PREFIX = "${TOPDIR}/tmp"
+```
+For example, versal:
 ```
-3. Install the setup SDK:
+$ gen-machineconf --soc-family versal --hw-description <path_to_sdtgen_output_directory> -c conf/ -l conf/local.conf
 ```
-$ .${TMPDIR}/tmp/deploy/sdk/x86_64-xilinx-nativesdk-prestep-2023.2....sh -d prestep -y
+The following will be written to the end of the conf/local.conf file:
+```
+# Use the newly generated MACHINE
+MACHINE = "xlnx-versal-vmk180-rev1-1-x-ebm-01-reva"
+# Avoid errors in some baremetal configs as these layers may be present
+# but are not used.  Note the following lines are optional and can be
+# safetly disabled.
+SKIP_META_VIRT_SANITY_CHECK = "1"
+SKIP_META_SECURITY_SANITY_CHECK = "1"
+SKIP_META_TPM_SANITY_CHECK = "1"
+# Each generated multiconfig defines it's own TMPDIR, either edit the
+# multiconfig files, or uncomment and adjust MC_TMPDIR_PREFIX below
+#MC_TMPDIR_PREFIX = "${TOPDIR}/tmp"
 ```
+> **Bitbake Performance Note:**
+Each BBMULTICONFIG value requires all of the recipes to be parsed for that
+configuration.  Thus each multiconfig will add more parsing time.  A long list
+can lead to a very slow parse (many minutes).  To speed up parsing, it is
+suggested that you trim this down to only the configurations you require.
+A minimum configuration is included with the generated configuration.
-Then follow the instructions in the 'prestep/README-setup' file.
+5. Build your project, You should now be able to build your project normally.
+   See the Yocto Project documentation if you have questions on how to work with
+   the multiconfig recipes. The following is a simple build for testing.
+6. Continue [Building Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.building.md)
+   from step 6.
 ## Dependencies
@@ -56,5 +162,14 @@ This layer depends on:
        https://git.yoctoproject.org/meta-xilinx (official version)
        https://github.com/Xilinx/meta-xilinx (development and amd xilinx release)
        layers: meta-xilinx-core, meta-xilinx-bsp, meta-xilinx-standalone
-        branch: langdale or amd xilinx release version (e.g. rel-v2023.1)
+        branch: langdale or amd xilinx release version (e.g. rel-v2024.1)
+        URI:
+        https://git.yoctoproject.org/meta-virtualization (official version)
+        https://github.com/Xilinx/meta-virtualization (development and amd xilinx release)
+        branch: langdale or amd xilinx release version (e.g. rel-v2024.1)
+        URI:
+        https://github.com/OpenAMP/meta-openamp (official version)
+        https://github.com/Xilinx/meta-openamp (development and amd xilinx release)
+        branch: langdale or amd xilinx release version (e.g. rel-v2024.1)
diff --git a/meta-xilinx-standalone-experimental/README.sdt.bsp.md b/meta-xilinx-standalone-experimental/README.sdt.bsp.md
new file mode 100644
index 00000000..2b2ce4b0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/README.sdt.bsp.md
@@ -0,0 +1,46 @@
+# SDT BSP
+This section describes the SDT BSP settings which must be added to the generated
+machine configuration file, following [Build Instructions](README.md) step 4, in
+order to use the runqemu command.
+## SDT BSP settings
+The following board settings need to be added in sdt machine configuration file
+to define which QEMU device trees should be used.
+> **Variable usage examples:**
+>
+> QEMU Device tree deploy directory: `QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"`
+> 
+> QEMU PMU Device tree: `QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"`
+> 
+> QEMU PS Device tree: `QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"`
+>
+> QEMU PMC Board Device tree: `QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"`
+>
+> QEMU Memory: Some boards for example VEK280 and VH158 memory configurations are
+> different, Hence we need to adjust the same in QB_MEM to match board dtsi files.
+> Below are some examples.
+> * ZynqMP `QB_MEM = "-m 4096"`
+> * Versal VEK280 `QB_MEM = "-m 12G"`
+| Devices | Evaluation Board                                                              |   QEMU PMC or PMU DTB file  |        QEMU PS DTB file       | QB Mem |
+|---------|-------------------------------------------------------------------------------|-----------------------------|-------------------------------|--------|
+| ZynqMP  | [ZCU102](https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html) | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU104](https://www.xilinx.com/products/boards-and-kits/zcu104.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU106](https://www.xilinx.com/products/boards-and-kits/zcu106.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU111](https://www.xilinx.com/products/boards-and-kits/zcu111.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU208](https://www.xilinx.com/products/boards-and-kits/zcu208.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU216](https://www.xilinx.com/products/boards-and-kits/zcu216.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+|         | [ZCU670](https://www.xilinx.com/products/boards-and-kits/zcu670.html)         | `zynqmp-pmu.dtb`            | `zcu102-arm.dtb`              |  4096  |
+| Versal  | [VCK190](https://www.xilinx.com/products/boards-and-kits/vck190.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vck190.dtb`  |   8G   |
+|         | [VMK180](https://www.xilinx.com/products/boards-and-kits/vmk180.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vmk180.dtb`  |   8G   |
+|         | [VPK120](https://www.xilinx.com/products/boards-and-kits/vpk120.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vpk120.dtb`  |   8G   |
+|         | [VPK180](https://www.xilinx.com/products/boards-and-kits/vpk180.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vpk180.dtb`  |   8G   |
+|         | [VEK280](https://www.xilinx.com/products/boards-and-kits/vek280.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vek280.dtb`  |  12G   |
+|         | [VHK158](https://www.xilinx.com/products/boards-and-kits/vhk158.html)         | `board-versal-pmc-virt.dtb` | `board-versal-ps-vhk158.dtb`  |  32G   |
+> **Note:** Additional information on Xilinx architectures can be found at:
+        https://www.xilinx.com/products/silicon-devices.html
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
index febdebad..b6f799b9 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
@@ -2,8 +2,9 @@ PV = "${ESW_VER}"
 inherit python3native xlnx-embeddedsw pkgconfig cmake
-# Override xlnx-embeddedsw with out version
+# It is unclear why the following is needed, but without this cmake/ninja
-require conf/dtb-embeddedsw.inc
+# will generate: -isystem /usr/include which will cause a build failure.
+OECMAKE_ARGS:remove = "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
 SRCREV_FORMAT = "src_decouple"
@@ -35,37 +36,43 @@ do_configure[depends] += "device-tree:do_deploy"
 do_compile[depends] += "device-tree:do_deploy"
 do_install[depends] += "device-tree:do_deploy"
-def get_xlnx_cmake_machine(fam, d):
+def get_xlnx_cmake_machine(fam, variant, d):
    cmake_machine = fam
    if (fam == 'zynqmp'):
        cmake_machine = 'ZynqMP'
    elif (fam == 'versal'):
        cmake_machine = 'Versal'
+        if (variant == 'net'):
+            cmake_machine = 'VersalNet'
    elif (fam == 'zynq'):
        cmake_machine = 'Zynq'
    return cmake_machine
-def get_xlnx_cmake_processor(tune, machine, d):
+def get_xlnx_cmake_processor(tune, machine, variant, d):
    cmake_processor = tune
    if tune.startswith('microblaze'):
        if (machine == 'psu_pmu_0'):
            cmake_processor = 'pmu_microblaze'
-        elif (machine == 'psv_pmc_0'):
+        elif (machine in [ 'psv_pmc_0', 'psx_pmc_0' ]):
            cmake_processor = 'plm_microblaze'
        else:
            cmake_processor = 'microblaze'
-    elif tune == 'cortexr5':
+    elif (tune in [ 'cortexr5', 'cortexr5hf' ]):
        cmake_processor = 'cortexr5'
+    elif (tune in [ 'cortexr52', 'cortexr52hf' ]):
+        cmake_processor = 'cortexr52'
    elif tune.startswith('cortexa9'):
        cmake_processor = 'cortexa9'
    elif (tune in [ 'cortexa53', 'cortexa72-cortexa53' ]):
        cmake_processor = 'cortexa53'
    elif tune == 'cortexa72':
        cmake_processor = 'cortexa72'
+        if (variant == 'net'):
+            cmake_processor = 'cortexa78'
    return cmake_processor
-XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}"
+XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d.getVar('SOC_VARIANT'), d)}"
-XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}"
+XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d.getVar('SOC_VARIANT'), d)}"
 XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
 XLNX_CMAKE_BSP_VARS ?= ""
@@ -80,11 +87,11 @@ cmake_do_generate_toolchain_file:append() {
    # set( CMAKE_SYSTEM_NAME `echo elf | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
    set( CMAKE_SYSTEM_NAME "${XLNX_CMAKE_SYSTEM_NAME}" )
    set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${S}/cmake)
-    set( CMAKE_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR})
+    set( CMAKE_LIBRARY_PATH ${B})
    if ("${XLNX_CMAKE_PROCESSOR}" STREQUAL "plm_microblaze")
        set( CMAKE_BUILD_TYPE Release)
    endif()
-    add_definitions( "${XLNX_CMAKE_BSP_VARS}" )
+    add_definitions( "${XLNX_CMAKE_BSP_VARS} -DSDT" )
 EOF
 }
@@ -96,6 +103,15 @@ do_install() {
 }
 CFLAGS:append = " ${ESW_CFLAGS}"
+EXTRA_OECMAKE += "-DYOCTO=ON"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/lib/bsp/standalone/src/ hwcmake_metadata ${S}
+    install -m 0755 StandaloneExample.cmake ${S}/cmake/Findcommonmeta.cmake
+    )
+}
 # We need to find the license file, which vaires depending on the component
 # recurse a maximum of x times, could be fancier but it gets complicated since
@@ -135,9 +151,9 @@ python do_generate_driver_data() {
    os.chdir(d.getVar('B'))
    command = ["lopper"] + ["-f"] + [system_dt[0]] + ["--"] + ["baremetalconfig_xlnx.py"] + [machine] + [src_dir[0]]
    subprocess.run(command, check = True)
-    src_file = str("x") + driver_name.replace('-', '_') + str("_g.c")
+    src_file = glob.glob('*_g.c')
-    if os.path.exists(src_file):
+    if os.path.exists(src_file[0]):
         bb.note("Generated config file for driver %s" % driver_name)
-         command = ["install"] + ["-m"] + ["0755"] + [src_file] + [src_dir[0]]
+         command = ["install"] + ["-m"] + ["0755"] + [src_file[0]] + [src_dir[0]]
         subprocess.run(command, check = True)
 }
diff --git a/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
new file mode 100644
index 00000000..85b753a5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.  All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# This bbclass is inherited by esw application recipes. This class provides
+# common code for elf name, bitbake install and deploy task functionality for
+# multiconfig target images.
+inherit deploy image-artifact-names
+APP_IMAGE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${BB_CURRENT_MC}${IMAGE_VERSION_SUFFIX}"
+ESW_EXECUTABLE_NAME ?= ""
+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}/${ESW_EXECUTABLE_NAME}* ${D}/${base_libdir}/firmware
+}
+do_deploy() {
+    # We need to deploy the stripped elf, hence why not doing it from ${D}
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
+    ln -sf ${APP_IMAGE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.elf
+    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin
+    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
+    ln -sf ${APP_IMAGE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.bin
+}
+addtask deploy before do_build after do_package
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
index 43e78191..9a94f3cd 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
@@ -7,6 +7,7 @@ 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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
    )
 }
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
deleted file mode 100644
index a9192f62..00000000
--- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# The format of this file must be compatible with
-# meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
-# Make it clear decoupling is 'experimental' in the version
-ESW_VER = "2023_sdt_experimental"
-REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https"
-ESW_BRANCH[2023_sdt_experimental] = "xlnx_rel_v2023.2_sdt"
-ESW_REV[2023_sdt_experimental] = "742a608800e7621fb7c376daf5124333b5826d6d"
-LIC_FILES_CHKSUM[xlnx_rel_v2023.2_sdt] = 'ce611484168a6000bd35df68fc4f4290'
diff --git a/meta-xilinx-standalone-experimental/conf/layer.conf b/meta-xilinx-standalone-experimental/conf/layer.conf
index 6cfd01c3..b4282ce0 100644
--- a/meta-xilinx-standalone-experimental/conf/layer.conf
+++ b/meta-xilinx-standalone-experimental/conf/layer.conf
@@ -19,7 +19,8 @@ LAYERDEPENDS_xilinx-standalone-exp = "core \
        xilinx \
        xilinx-standalone \
        xilinx-microblaze \
-        virtualization-layer \
+        virtualization-layer \
+        openamp-layer \
        "
 LAYERSERIES_COMPAT_xilinx-standalone-exp = "scarthgap"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb
new file mode 100644
index 00000000..4287bb0a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/ddr-self-refresh/ddr-self-refresh_2024.1.bb
@@ -0,0 +1,29 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/ddr_self_refresh/src/"
+DEPENDS += "libxil xiltimer xilpm"
+ESW_EXECUTABLE_NAME = "ddr_self_refresh"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/ddr_self_refresh*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb
index d62779ae..2c70796a 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb
@@ -1,11 +1,9 @@
-inherit esw deploy
+inherit esw deploy python3native
 ESW_COMPONENT_SRC = "/lib/sw_apps/empty_application/src/"
 DEPENDS += "libxil xiltimer"
-inherit python3native
 do_configure:prepend() {
    (
    cd ${S}
@@ -24,7 +22,7 @@ EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
 inherit image-artifact-names
-CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${BB_CURRENT_MC}${IMAGE_VERSION_SUFFIX}"
 ESW_COMPONENT ??= "empty_application.elf"
@@ -38,8 +36,8 @@ do_install() {
 do_deploy() {
    install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.elf
-    ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.elf
+    ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.elf
    install -m 0644 ${B}/empty_application.bin ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.bin
-    ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.bin
+    ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.bin
 }
 addtask deploy before do_build after do_install
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb
new file mode 100644
index 00000000..97d2ba0a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_2024.1.bb
@@ -0,0 +1,19 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
+DEPENDS += "libxil xilstandalone freertos10-xilinx xiltimer"
+ESW_EXECUTABLE_NAME = "freertos_hello_world"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+FILES:${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
deleted file mode 100644
index 8106684b..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
-DEPENDS += "libxil xilstandalone freertos10-xilinx xiltimer"
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-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}/freertos_hello_world* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf 
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb
new file mode 100644
index 00000000..58d5b9c7
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+ESW_EXECUTABLE_NAME = "freertos_lwip_echo_server"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
deleted file mode 100644
index f7eae1dc..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/freertos_lwip_echo* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb
new file mode 100644
index 00000000..5c00254c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+ESW_EXECUTABLE_NAME = "freertos_lwip_tcp_perf_client"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
deleted file mode 100644
index 51b89b8e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/freertos_lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb
new file mode 100644
index 00000000..910a6fa2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+ESW_EXECUTABLE_NAME = "freertos_lwip_tcp_perf_server"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
deleted file mode 100644
index 606fd01e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/freertos_lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb
new file mode 100644
index 00000000..c20d640d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+ESW_EXECUTABLE_NAME = "freertos_lwip_udp_perf_client"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
deleted file mode 100644
index 7f9d86e2..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/freertos_lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb
new file mode 100644
index 00000000..194b0565
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
+DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
+ESW_EXECUTABLE_NAME = "freertos_lwip_udp_perf_server"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
deleted file mode 100644
index 4fc02f36..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
-DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/freertos_lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb
new file mode 100644
index 00000000..ee0afec5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw deploy python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/hello_world/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "hello_world"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+FILES:${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
deleted file mode 100644
index 1de5ef8c..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_apps/hello_world/src/"
-DEPENDS += "libxil xiltimer"
-inherit python3native
-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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-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}/hello_world* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-ESW_CUSTOM_LINKER_FILE ?= "None"
-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb
new file mode 100644
index 00000000..f3397f7f
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
+DEPENDS += "libxil lwip xiltimer"
+ESW_EXECUTABLE_NAME = "lwip_echo_server"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
deleted file mode 100644
index c59d816e..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
-DEPENDS += "libxil lwip 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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/lwip_echo* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb
new file mode 100644
index 00000000..bc90046e
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
+DEPENDS += "libxil lwip xiltimer"
+ESW_EXECUTABLE_NAME = "lwip_tcp_perf_client"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
deleted file mode 100644
index b9834e34..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
-DEPENDS += "libxil lwip 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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb
new file mode 100644
index 00000000..5c9cd5fa
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
+DEPENDS += "libxil lwip xiltimer"
+ESW_EXECUTABLE_NAME = "lwip_tcp_perf_server"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
deleted file mode 100644
index 0acc4b8f..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
-DEPENDS += "libxil lwip 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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb
new file mode 100644
index 00000000..2855b08c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
+DEPENDS += "libxil lwip xiltimer"
+ESW_EXECUTABLE_NAME = "lwip_udp_perf_client"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
deleted file mode 100644
index 00a9eaa6..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
-DEPENDS += "libxil lwip 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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-LWIP_UDP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb
new file mode 100644
index 00000000..149e7a6c
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
+DEPENDS += "libxil lwip xiltimer"
+ESW_EXECUTABLE_NAME = "lwip_udp_perf_server"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
deleted file mode 100644
index 5f54caf9..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
-DEPENDS += "libxil lwip 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}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-do_generate_app_data() {
-    # 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}/
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-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}/lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb
new file mode 100644
index 00000000..8420171b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_2024.1.bb
@@ -0,0 +1,19 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/memory_tests/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "memory_tests"
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+FILES:${PN} = "${base_libdir}/firmware/memory_tests*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
deleted file mode 100644
index 1ece5a8c..00000000
--- a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_apps/memory_tests/src/"
-DEPENDS += "libxil xiltimer"
-inherit python3native
-do_configure:prepend() {
-    (
-    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
-    )
-}
-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}/memory_tests* ${D}/${base_libdir}/firmware
-}
-inherit image-artifact-names
-MEMORY_TESTS_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.elf ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.elf
-    ln -sf ${MEMORY_TESTS_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.elf ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/memory_tests.bin ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.bin
-    ln -sf ${MEMORY_TESTS_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/memory_tests*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb
new file mode 100644
index 00000000..58f08bf2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-echo-testd.bb
@@ -0,0 +1,6 @@
+require openamp-fw.inc
+PROVIDES:append:armv7r = " openamp-fw-echo-testd "
+OPENAMP_FW_SRC_NAME = "rpmsg-echo.out"
+OPENAMP_FW_NAME = "image_echo_test"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb
new file mode 100644
index 00000000..c8d4382d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-mat-muld.bb
@@ -0,0 +1,6 @@
+require openamp-fw.inc
+PROVIDES:append:armv7r = " openamp-fw-mat-muld "
+OPENAMP_FW_SRC_NAME = "matrix_multiplyd.out"
+OPENAMP_FW_NAME = "image_matrix_multiply"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb
new file mode 100644
index 00000000..4efdb4c6
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw-rpc-demo.bb
@@ -0,0 +1,9 @@
+require openamp-fw.inc
+PROVIDES:append:armv7r = " openamp-fw-rpc-demo "
+OPENAMP_FW_SRC_NAME = "rpc_demo.out"
+OPENAMP_FW_NAME = "image_rpc_demo"
+OPENAMP_WITH_PROXY = "ON"
+# NOTE: BSP should have flag ESW_CFLAGS:append = " -DUNDEFINE_FILE_OPS=1 "
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc
new file mode 100644
index 00000000..398f8dce
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/openamp-fw/openamp-fw.inc
@@ -0,0 +1,27 @@
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+LICENSE = "MIT"
+INSANE_SKIP:${PN} = "arch"
+FW_LIB_DIR = "/lib/firmware"
+OPENAMP_FW_SRC_NAME ?= "rpmsg-echo.out"
+OPENAMP_FW_NAME ?= "image_echo_test"
+FW_MACHINE:zynqmp = "cortexr5-0-zynqmp"
+FW_MACHINE:versal = "cortexr5-0-versal"
+FW_MACHINE:versal-net = "cortexr52-0-versal-net"
+FW_OS ?= "baremetal"
+OPENAMP_FW_DEPLOY_DIR ?= "${MC_TMPDIR_PREFIX}-${FW_MACHINE}-${FW_OS}/deploy/images/${MACHINE}"
+DEPENDS = " open-amp-xlnx "
+do_install[mcdepends] += "mc::${FW_MACHINE}-${FW_OS}:open-amp-xlnx:do_deploy"
+do_install() {
+        install -d ${D}${FW_LIB_DIR}
+        src=${OPENAMP_FW_DEPLOY_DIR}/${OPENAMP_FW_SRC_NAME}
+        dest=${D}${FW_LIB_DIR}/${OPENAMP_FW_NAME}
+        install -m 0644 ${src} ${dest}
+}
+do_compile[noexec] = "1"
+FILES:${PN} = "/lib/firmware/${OPENAMP_FW_NAME}"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_2024.1.bb
index b6b15d5a..d2fb106a 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_2024.1.bb
@@ -1,10 +1,10 @@
-inherit esw deploy
+inherit esw python3native esw_apps_common
 ESW_COMPONENT_SRC = "/lib/sw_apps/peripheral_tests/src/"
 DEPENDS += "libxil xiltimer"
-inherit python3native
+ESW_EXECUTABLE_NAME = "peripheral_tests"
 do_configure:prepend() {
    (
@@ -37,16 +37,8 @@ python do_generate_app_data() {
 addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
 do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-PERIPHERAL_TEST_APP_IMAGE_NAME ??= "${BPN}"
-inherit image-artifact-names
-PERIPHERAL_TEST_BASE_NAME ?= "${PERIPHERAL_TEST_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-ESW_COMPONENT ??= "peripheral_tests.elf"
 do_compile:append() {
-    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/peripheral_tests.bin
+    ${OBJCOPY} -O binary ${B}/${ESW_EXECUTABLE_NAME}.elf ${B}${ESW_EXECUTABLE_NAME}.bin
 }
 do_install() {
@@ -54,9 +46,8 @@ do_install() {
 }
 do_deploy() {
-    install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.elf
+    install -Dm 0644 ${B}/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
-    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
+    ln -sf ${APP_IMAGE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.elf
-    install -m 0644 ${B}/peripheral_tests.bin ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.bin
+    install -m 0644 ${B}/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
-    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
+    ln -sf ${APP_IMAGE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.bin
 }
-addtask deploy before do_build after do_install
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb b/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb
new file mode 100644
index 00000000..5def36c3
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/sample-fw-package/sample-fw-package.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Sample recipe to package and deploy baremetal or freertos elf or bin to linux rootfs"
+LICENSE = "CLOSED"
+inherit fw-package
+FW_NAME = "hello-world"
+TARGET_MC = "cortexr5-0-zynqmp-baremetal"
+FW_MCDEPENDS := "${@bb.utils.contains('BBMULTICONFIG', '${TARGET_MC}', 'mc::${TARGET_MC}:${FW_NAME}:do_deploy', '', d)}"
+FW_DEPLOY_DIR := "${@bb.utils.contains('BBMULTICONFIG', '${TARGET_MC}', '${TOPDIR}/tmp-${TARGET_MC}/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb
new file mode 100644
index 00000000..03ada8c1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/srec-bootloader/srec-bootloader_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/srec_bootloader/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "srec_bootloader"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+FILES:${PN} = "${base_libdir}/firmware/srec_bootloader*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb
new file mode 100644
index 00000000..e6f29570
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/srec-spi-bootloader/srec-spi-bootloader_2024.1.bb
@@ -0,0 +1,22 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/srec_spi_bootloader/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "srec_spi_bootloader"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+FILES:${PN} = "${base_libdir}/firmware/srec_spi_bootloader*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb
new file mode 100644
index 00000000..8e0b0c06
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/zynq-dram-test/zynq-dram-test_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/zynq_dram_test/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "zynq_dram_test"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/zynq_dram*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb
new file mode 100644
index 00000000..25215801
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-applications/zynqmp-dram-test/zynqmp-dram-test_2024.1.bb
@@ -0,0 +1,28 @@
+inherit esw python3native esw_apps_common
+ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_dram_test/src/"
+DEPENDS += "libxil xiltimer"
+ESW_EXECUTABLE_NAME = "zynqmp_dram_test"
+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}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
+do_generate_app_data() {
+    # 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}/
+}
+addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
+FILES:${PN} = "${base_libdir}/firmware/zynqmp_dram*"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_git.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index e6cf1d8b..f99db010 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_git.bb
+++ b/meta-xilinx-standalone-experimental/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
-# We need to override the inherit
-require conf/dtb-embeddedsw.inc
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
index d40f3cdb..d40f3cdb 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_2024.1.bbappend
index 202764ac..202764ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bbappend
index 0c51fbad..0c51fbad 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_2024.1.bbappend
index 96cd38cd..96cd38cd 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_2024.1.bbappend
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
deleted file mode 100644
index 0a5736d8..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ /dev/null
@@ -1,102 +0,0 @@
-Document Version: 20230112
-The Yocto Project setup for the System Device Tree workflow is as follows.
-Be sure to read everything below, as the steps will be updated in the future
-if the setup script changes.
-The steps in this document expect that you have already built the setup
-(meta-xilinx-setup) SDK, and installed it.
-* Run the setup script
-The setup environment should be run in a new shell (not the build shell)
-to ensure that you do not contaminate the environment for your build.
-We will assume below that the directory "prestep" was used for the SDK,
-however you may use any path you wish.
-Source the SDK environment file
- $ . <build>/prestep/environment-setup-x86_64-petalinux-linux
-Run the script from the same directory as this README
- $ <build>/prestep/dt-processor.sh -c <conf> -s <dtb> -l conf/local.conf
-Note: The -l option will automatically add the necessary parameters to the
-local.conf file.  If you need to re-run this comment, you just clear the
-parameters from the end of the file.  Without the -l option the items are
-printed to the screen and must be manually added to your conf/local.conf
-For example, zynqmp:
- $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/zcu102-sdt/system-top.dts -l conf/local.conf
-The following will be written to the end of the conf/local.conf file:
-  # Each multiconfig will define it's own TMPDIR, this is the new default based
-  # on BASE_TMPDIR for the Linux build
-  TMPDIR = "${BASE_TMPDIR}/tmp"
-  # Use the newly generated MACHINE
-  MACHINE = "xlnx-zynqmp-zcu102-rev1-0"
-  
-  # All of the TMPDIRs must be in a common parent directory. This is defined
-  # as BASE_TMPDIR.
-  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-  BASE_TMPDIR ?= "${TOPDIR}"
-  
-  # The following is the full set of multiconfigs for this configuration
-  # A large list can cause a slow parse.
-  BBMULTICONFIG = " cortexa53-0-zynqmp-fsbl-baremetal cortexa53-0-zynqmp-baremetal cortexa53-0-zynqmp-freertos cortexa53-1-zynqmp-baremetal cortexa53-1-zynqmp-freertos cortexa53-2-zynqmp-baremetal cortexa53-2-zynqmp-freertos cortexa53-3-zynqmp-baremetal cortexa53-3-zynqmp-freertos cortexr5-0-zynqmp-fsbl-baremetal cortexr5-0-zynqmp-baremetal cortexr5-0-zynqmp-freertos cortexr5-1-zynqmp-baremetal cortexr5-1-zynqmp-freertos microblaze-0-pmu"
-  # Alternatively trim the list to the minimum
-  #BBMULTICONFIG = " cortexa53-0-zynqmp-fsbl-baremetal microblaze-0-pmu"
-For example, versal:
- $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/vmk180-sdt/system-top.dts -l conf/local.conf
-The following will be written to the end of the conf/local.conf file:
-  # Each multiconfig will define it's own TMPDIR, this is the new default based
-  # on BASE_TMPDIR for the Linux build
-  TMPDIR = "${BASE_TMPDIR}/tmp"
-  
-  # Use the newly generated MACHINE
-  MACHINE = "xlnx-versal-vmk180-rev1-1-x-ebm-01-reva"
-  
-  # All of the TMPDIRs must be in a common parent directory. This is defined
-  # as BASE_TMPDIR.
-  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-  BASE_TMPDIR ?= "${TOPDIR}"
-  
-  # The following is the full set of multiconfigs for this configuration
-  # A large list can cause a slow parse.
-  BBMULTICONFIG = " cortexa72-0-versal-baremetal cortexa72-0-versal-freertos cortexa72-1-versal-baremetal cortexa72-1-versal-freertos microblaze-0-pmc microblaze-0-psm cortexr5-0-versal-baremetal cortexr5-0-versal-freertos cortexr5-1-versal-baremetal cortexr5-1-versal-freertos"
-  # Alternatively trim the list to the minimum
-  #BBMULTICONFIG = " microblaze-0-pmc microblaze-0-psm"
-You can now EXIT THE NEW SHELL return the build environment for the remaining steps.
-* Bitbake Performance Note
-Each BBMULTICONFIG value requires all of the recipes to be parsed for that
-configuration.  Thus each multiconfig will add more parsing time.  A long list
-can lead to a very slow parse (many minutes).  To speed up parsing, it is
-suggested that you trim this down to only the configurations you require.
-A minimum configuration is included with the generated configuration.
-* Build your project
-You should now be able to build your project normally.  See the Yocto Project
-documentation if you have questions on how to work with the multiconfig
-recipes.  The following is a simple build for testing.
-In the original build shell
-Build your Linux sytem:
- $ bitbake petalinux-image-minimal
-The output will be in tmp/deploy/images/...
-If the system is QEMU capable execute QEMU using:
- $ runqemu nographic slirp core-image-minimal
-To terminate qemu, usually the command is ctrl-a x
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
deleted file mode 100755
index 1c754689..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ /dev/null
@@ -1,1260 +0,0 @@
-#! /bin/bash
-# Copyright (c) 2021-2022 Xilinx Inc
-# Copyright (C) 2022-2023 Advanced Micro Devices, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-# This script configures the Yocto Project build system for use with the System
-# Device Tree workflow when building for a Xilinx FPGA, such as the ZynqMP or
-# Versal.
-error() { echo "ERROR: $1" >&2; exit 1; }
-warn() { echo "WARNING: $1"; }
-info() { echo "INFO: $1"; }
-usage() {
-  cat <<EOF
-$0
-    -c <config_dir>         Location of the build conf directory
-    -s <system_dts>         Path to system dts
-    [-d <domain_file>]      Path to domain file (.yml/.dts)
-    [-o <overlay_dts>]      Generate overlay dts
-    [-e <external_fpga>]    Apply a partial overlay
-    [-m <machine_conf>]     The name of the machine .conf to generate
-    [-D <dts_path>]         Absolute path or subdirectory of conf/dts to place DTS files in (usually auto detected from DTS)
-    [-t <machine>]          Machine type: zynqmp or versal (usually auto detected)
-    [-v <soc_variant>]      SOC Variant: cg, dr, eg, ev, ai-prime, premium (usually auto detected)
-    [-r <require_machine>]  This machine will be required, instead of the generic machine if defined
-    [-O <overrides>]        Optional, can add additional overrides to the generated machine
-    [-p <psu_init_path>]    Path to psu_init files, defaults to system_dts path
-    [-i <pdi_path>]         Path to the pdi file
-    [-l <config_file>]      write local.conf changes to this file
-    [-P <petalinux_schema>] Path to petalinux schema file
-EOF
-  exit
-}
-parse_args() {
-  [ $# -eq 0 ] && usage
-  [ $1 = "--help" ] && usage
-  while getopts ":c:s:d:o:e:m:D:l:hP:p:i:t:v:r:O:" opt; do
-    case ${opt} in
-      c) config_dir=$OPTARG ;;
-      s) system_dts=$OPTARG ;;
-      o) overlay_dts=$OPTARG ;;
-      d) domain_file=$OPTARG ;;
-      e) external_fpga=$OPTARG ;;
-      m) mach_conf=$OPTARG ; mach_conf=${mach_conf%%.conf} ;;
-      D) dts_path=$OPTARG ;;
-      t) machine=$OPTARG ;;
-      v) soc_variant=$OPTARG ;;
-      r) incmachine=$OPTARG ;;
-      O) overrides=$OPTARG ;;
-      p) psu_init_path=$OPTARG ;;
-      i) pdi_path=$OPTARG ;;
-      l) localconf=$OPTARG ;;
-      P) petalinux_schema=$OPTARG ;;
-      h) usage ;;
-      :) error "Missing argument for -$OPTARG" ;;
-      \?) error "Invalid option -$OPTARG" ;;
-    esac
-  done
-  [ -z "${config_dir}" ] && error "You must specify the path to the build conf directory with -c"
-  [ -z "${system_dts}" ] && error "You must specify the path to the system device tree with -s"
-  [ -f "${config_dir}/local.conf" ] || error "Invalid config dir: ${config_dir}"
-  [ -f "${system_dts}" ] || error "Unable to find: ${system_dts}"
-  system_dts=$(realpath ${system_dts})
-  if [ -z "$psu_init_path" ]; then
-    psu_init_path=$(dirname ${system_dts})
-  else
-    psu_init_path=$(realpath ${psu_init_path})
-  fi
-  if [ -z "$pdi_path" ]; then
-    pdi_path=$(dirname ${system_dts})
-  else
-    pdi_path=$(realpath ${pdi_path})
-  fi
-  if [ -n "$domain_file" ]; then
-    domain_file=$(realpath ${domain_file})
-  fi
-}
-detect_machine() {
-  if [ -z "${machine}" ]; then
-    if [ -n "${deviceid}" ]; then
-      case ${deviceid} in
-         # ZynqMP variants
-         xczu*cg)
-           machine="zynqmp"
-           soc_variant="cg" ;;
-         xczu*dr)
-           machine="zynqmp"
-           soc_variant="dr" ;;
-         xczu*eg)
-           machine="zynqmp"
-           soc_variant="eg" ;;
-         xczu*ev)
-           machine="zynqmp"
-           soc_variant="ev" ;;
-         # Versal variants
-         xcvm*)
-           machine="versal"
-           soc_variant="prime" ;;
-         xcvc*)
-           machine="versal"
-           soc_variant="ai-core" ;;
-         xcve*)
-           machine="versal"
-           soc_variant="ai-edge" ;;
-         xcvn*)
-           machine="versal"
-           soc_variant="net" ;;
-         xcvp*)
-           machine="versal"
-           soc_variant="premium" ;;
-         xcvh*)
-           machine="versal"
-           soc_variant="hbm" ;;
-         # Special Case Starter Kit SOMs
-         xck26)
-           if [ -z "${incmachine}" ]; then
-             incmachine="k26-smk.conf"
-           fi
-           machine="zynqmp"
-           soc_variant="ev" ;;
-         xck24)
-           if [ -z "${incmachine}" ]; then
-             incmachine="k24-smk.conf"
-           fi
-           machine="zynqmp"
-           soc_variant="eg" ;;
-      esac
-    else
-      # Identify the system type first using PSM/PMC/PMU
-      while read -r cpu core domain cpu_name os_hint; do
-        case ${cpu} in
-          pmu-microblaze)
-            machine="zynqmp" ;;
-          pmc-microblaze | psm-microblaze)
-            machine="versal" ;;
-        esac
-      done <${cpulist}
-    fi
-  fi
-  # Machine not provided and we cannot identify..
-  [ -z ${machine} ] && \
-    error "Unable to autodetect machine type, use -t to specify the machine."
-  case ${machine} in
-    zynqmp | versal) : ;;
-    *) error "Invalid machine type ${machine}; please choose zynqmp or versal"
-  esac
-  [ -z ${soc_variant} ] && \
-    warn "Unable to autodetect soc variant, use -v to specify a variant."
-}
-dump_cpus() {
-    prefix="$1"
-    while read -r cpu core domain cpu_name os_hint; do
-      case ${cpu} in
-        \#*) ;;
-        \[*) ;;
-        pmu-microblaze)   echo "${prefix}zynqmp-pmu ${cpu_name}" ;;
-        pmc-microblaze)   echo "${prefix}versal-plm ${cpu_name}" ;;
-        psm-microblaze)   echo "${prefix}versal-psm ${cpu_name}" ;;
-        xlnx,microblaze)  echo "${prefix}microblaze ${core} ${cpu_name}";;
-        arm,*)            echo "${prefix}${cpu/,/ } ${core} ${cpu_name}";;
-        *)                echo "${prefix}${cpu} ${core} ${cpu_name}";;
-      esac
-    done <${cpulist}
-}
-cortex_a53_linux() {
-  info "cortex-a53 for Linux [ $1 ]"
-  if [ "$1" = "None" ]; then
-    dts_file="cortexa53-${machine}-linux.dts"
-    system_conf=${dts_file}
-    conf_file=""
-  else
-    mc_name=cortexa53-${machine}-$1-linux
-    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/${mc_name}.conf
-  fi
-  # Check if it is overlay dts otherwise just create linux dts
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ "${overlay_dts}" = "true" ]; then
-      if [ "${external_fpga}" = "true" ]; then
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- xlnx_overlay_dt ${machine} full \
-          || error "lopper failed"
-      else
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- xlnx_overlay_dt ${machine} partial \
-          || error "lopper failed"
-      fi
-      dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
-    elif [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53.dts" \
-        -i "${lops_dir}/lop-domain-linux-a53-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    fi
-    rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb lop-domain-linux-a53-prune.dts.dtb
-  )
-  if [ -z "${conf_file}" ]; then
-      return $?
-  fi
-  ## Generate a multiconfig
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-EOF
-}
-a53_fsbl_done=0
-cortex_a53_baremetal() {
-  if [ "$1" = "fsbl" ]; then
-    [ ${a53_fsbl_done} = 1 ] && return
-    info "cortex-a53 FSBL baremetal configuration"
-  else
-    info "cortex-a53 baremetal configuration for core $2 [ $1 ]"
-  fi
-  suffix=""; lto="-nolto"
-  if [ "$1" != "None" ]; then
-    suffix="-$1"; lto=""
-  fi
-  mc_name="cortexa53-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  yocto_distro="xilinx-standalone${lto}"
-  if [ "$1" = "fsbl" ]; then
-    fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-    multiconf_min="${multiconf_min} ${mc_name}"
-    a53_fsbl_done=1
-  fi
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a53-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  if [ "$1" = "fsbl" ]; then
-    if [ ! -e "${psu_init_path}/psu_init.c" ]; then
-      warn "Warning: Unable to find psu_init.c in ${psu_init_path}"
-    fi
-    if [ ! -e "${psu_init_path}/psu_init.h" ]; then
-      warn "Warning: Unable to find psu_init.h in ${psu_init_path}"
-    fi
-    cat <<EOF >"${conf_file}"
-PSU_INIT_PATH = "${psu_init_path}"
-EOF
-  else
-    cat /dev/null >"${conf_file}"
-  fi
-  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa53"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "${yocto_distro}"
-EOF
-}
-cortex_a53_freertos() {
-  info "cortex-a53 FreeRTOS configuration for core $2 [ $1 ]"
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-  mc_name="cortexa53-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a53-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a53-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa53"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-freertos"
-EOF
-}
-cortex_a72_linux() {
-  info "cortex-a72 for Linux [ $1 ]"
-  # Find the first file ending in .pdi
-  full_pdi_path=$(ls ${pdi_path}/*.pdi 2>/dev/null | head -n 1)
-  if [ -z "${full_pdi_path}" ]; then
-    error "Unable to find a pdi file in ${pdi_path}, use the -i option to point to the directory containing a .pdi file"
-    full_pdi_path="__PATH TO PDI FILE HERE__"
-  elif [ "${full_pdi_path}" != "$(ls ${pdi_path}/*.pdi 2>/dev/null)" ]; then
-    warn "Warning: multiple PDI files found, using first found $(basename ${full_pdi_path})."
-  fi
-  if [ "$1" = "None" ]; then
-    dts_file="cortexa72-${machine}-linux.dts"
-    system_conf=${dts_file}
-    conf_file=""
-  else
-    mc_name="cortexa72-${machine}-$1-linux"
-    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/${mc_name}.conf
-  fi
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    # Check if it is overlay dts otherwise just create linux dts
-    if [ "${overlay_dts}" = "true" ]; then
-      # As there is no partial support on Versal, As per fpga manager implementation there is
-      # a flag "external_fpga" which says apply overlay without loading the bit file.
-      if [ "${external_fpga}" = "true" ]; then
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- xlnx_overlay_dt \
-          ${machine} full external_fpga || error "lopper failed"
-      else
-        # If there is no external_fpga flag, then the default is full
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- xlnx_overlay_dt \
-          ${machine} full || error "lopper failed"
-      fi
-      dtc -q -O dtb -o pl.dtbo -b 0 -@ pl.dtsi || error "dtc failed"
-    elif [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" \
-        -i "${lops_dir}/lop-domain-a72.dts" \
-        -i "${lops_dir}/lop-domain-a72-prune.dts" \
-        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        -i "${lops_dir}/lop-domain-a72.dts" \
-        -i "${lops_dir}/lop-domain-a72-prune.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f pl.dtsi lop-a72-imux.dts.dtb lop-domain-a72.dts.dtb lop-domain-a72-prune.dts.dtb
-  )
-  if [ -z "${conf_file}" ]; then
-      return $?
-  fi
-  ## Generate a multiconfig
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-EOF
-}
-cortex_a72_baremetal() {
-  info "cortex-a72 baremetal configuration for core $2 [ $1 ]"
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-  mc_name="cortexa72-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f   --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a72-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa72"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-standalone-nolto"
-EOF
-}
-cortex_a72_freertos() {
-  info "cortex-a72 FreeRTOS configuration for core $2 [ $1 ]"
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-  mc_name="cortexa72-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "${domain_file}" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-a72-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-a72-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexa72"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-freertos"
-EOF
-}
-r5_fsbl_done=0
-cortex_r5_baremetal() {
-  if [ "$1" = "fsbl" ]; then
-    [ ${r5_fsbl_done} = 1 ] && return
-    info "cortex-r5 FSBL baremetal configuration"
-  else
-    info "cortex-r5 baremetal configuration for core $2 [ $1 ]"
-  fi
-  suffix=""; lto="-nolto"
-  if [ "$1" != "None" ]; then
-    suffix="-$1"; lto=""
-  fi
-  mc_name="cortexr5-$2-${machine}${suffix}-baremetal"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  yocto_distro="xilinx-standalone${lto}"
-  if [ "$1" = "fsbl" ]; then
-    r5fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-    r5_fsbl_done=1
-  fi
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "$domain_file" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-r5-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  if [ "$1" = "fsbl" ]; then
-    if [ ! -e "${psu_init_path}/psu_init.c" ]; then
-      warn "Warning: Unable to find psu_init.c in ${psu_init_path}"
-    fi
-    if [ ! -e "${psu_init_path}/psu_init.h" ]; then
-      warn "Warning: Unable to find psu_init.h in ${psu_init_path}"
-    fi
-    cat <<EOF >"${conf_file}"
-PSU_INIT_PATH = "${psu_init_path}"
-EOF
-  else
-    cat /dev/null >"${conf_file}"
-  fi
-  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexr5"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "$yocto_distro"
-EOF
-}
-cortex_r5_freertos() {
-  info "cortex-r5 FreeRTOS configuration for core $2 [ $1 ]"
-  suffix=""
-  [ "$1" != "None" ] && suffix="-$1"
-  mc_name="cortexr5-$2-${machine}${suffix}-freertos"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    if [ -n "$domain_file" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
-        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-        "${system_dts}" "${dts_file}" || error "lopper failed"
-    fi
-    rm -f lop-r5-imux.dts.dtb
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$3"
-DEFAULTTUNE = "cortexr5"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-freertos"
-EOF
-}
-# Generate microblaze tunings
-microblaze_done=0
-process_microblaze() {
-  [ ${microblaze_done} = 1 ] && return
-  info "Generating microblaze processor tunes"
-  mkdir -p machine/include/${mach_conf}
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-microblaze-yocto.dts" "${system_dts}" \
-      || error "lopper failed"
-    rm -f lop-microblaze-yocto.dts.dtb
-  ) >machine/include/${mach_conf}/microblaze.inc
-  echo "require conf/machine/include/xilinx-microblaze.inc" >> machine/include/${mach_conf}/microblaze.inc
-  microblaze_done=1
-}
-# pmu-microblaze is ALWAYS baremetal, no domain
-pmu-microblaze() {
-  info "Microblaze ZynqMP PMU"
-  process_microblaze
-  mc_name="microblaze-0-pmu"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  pmu_mcdepends="mc::${mc_name}:pmu-firmware:do_deploy"
-  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$1"
-DEFAULTTUNE = "microblaze-pmu"
-TARGET_CFLAGS += "-DPSU_PMU=1U"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-standalone"
-EOF
-}
-# pmc-microblaze is ALWAYS baremetal, no domain
-pmc-microblaze() {
-  info "Microblaze Versal PMC"
-  process_microblaze
-  mc_name="microblaze-0-pmc"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  plm_mcdepends="mc::${mc_name}:plm-firmware:do_deploy"
-  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$1"
-DEFAULTTUNE = "microblaze-pmc"
-TARGET_CFLAGS += "-DVERSAL_PLM=1"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-standalone"
-EOF
-}
-# psm-microblaze is ALWAYS baremetal, no domain
-psm-microblaze() {
-  info "Microblaze Versal PSM"
-  process_microblaze
-  mc_name="microblaze-0-psm"
-  dts_file="${mc_name}.dts"
-  multiconf="${multiconf} ${mc_name}"
-  multiconf_min="${multiconf_min} ${mc_name}"
-  conf_file="multiconfig/${mc_name}.conf"
-  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
-  features="machine/include/${mach_conf}/${mc_name}-features.conf"
-  psm_mcdepends="mc::${mc_name}:psm-firmware:do_deploy"
-  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
-  # Build device tree
-  (
-    cd ${dts_path} || error "Unable to cd to ${dts_path} dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
-  )
-  # Build baremetal multiconfig
-  if [ -n "${domain_file}" ]; then
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
-  else
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
-      || error "lopper failed"
-  fi
-  mv libxil.conf "${libxil}"
-  mv distro.conf "${features}"
-  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
-  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "${dts_file_path}/${dts_file}"
-ESW_MACHINE = "$1"
-DEFAULTTUNE = "microblaze-psm"
-TARGET_CFLAGS += "-DVERSAL_psm=1"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-DISTRO = "xilinx-standalone"
-EOF
-}
-generate_machine() {
-  info "Generating machine conf file"
-  conf_file="machine/${mach_conf}.conf"
-  # Machine include file
-  if [ -z ${incmachine} ]; then
-    if [ -n ${soc_variant} ]; then
-      incmachine="${machine}-${soc_variant}-generic.conf"
-    else
-      incmachine="${machine}-generic.conf"
-    fi
-  fi
-  mkdir -p machine
-  # Generate header
-  cat <<EOF >"${conf_file}"
-#@TYPE: Machine
-#@NAME: ${mach_conf}
-#@DESCRIPTION: ${model}
-#### Preamble
-MACHINEOVERRIDES =. "\${@['', '${mach_conf}:']['${mach_conf}' != '\${MACHINE}']}"
-#### Regular settings follow
-EOF
-  if [ -n "${overrides}" ]; then
-    cat <<EOF >>"${conf_file}"
-MACHINEOVERRIDES .= ":${overrides}"
-EOF
-  fi
-  if [ "${machine}" == "zynqmp" ]; then
-    cat <<EOF >>"${conf_file}"
-TUNEFILE[microblaze-pmu] = "conf/machine/include/${mach_conf}/microblaze.inc"
-EOF
-  elif [ "${machine}" == "versal" ]; then
-    cat <<EOF >>"${conf_file}"
-TUNEFILE[microblaze-pmc] = "conf/machine/include/${mach_conf}/microblaze.inc"
-TUNEFILE[microblaze-psm] = "conf/machine/include/${mach_conf}/microblaze.inc"
-EOF
-  fi
-  sysdt_path=$(dirname ${system_dts})
-  sysdt_base=$(basename ${system_dts})
-  cat <<EOF >>"${conf_file}"
-# Set the default (linux) domain device tree
-CONFIG_DTFILE ?= "${dts_file_path}/${system_conf}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-require conf/machine/${incmachine}
-# System Device Tree does not use HDF_MACHINE
-HDF_MACHINE = ""
-# Set the system device trees
-SYSTEM_DTFILE_DIR = "${sysdt_path}"
-SYSTEM_DTFILE = "\${SYSTEM_DTFILE_DIR}/${sysdt_base}"
-SYSTEM_DTFILE[vardepsexclude] += "SYSTEM_DTFILE_DIR"
-# Load the dynamic machine features
-include conf/machine/include/${mach_conf}/\${BB_CURRENT_MC}-features.conf
-LIBXIL_CONFIG = "conf/machine/include/${mach_conf}/\${BB_CURRENT_MC}-libxil.conf"
-EOF
-  if [ -n "${fsbl_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# First Stage Boot Loader
-FSBL_DEPENDS = ""
-FSBL_MCDEPENDS = "${fsbl_mcdepends}"
-FSBL_DEPLOY_DIR = "${fsbl_deploy_dir}"
-EOF
-  fi
-  if [ -n "${r5fsbl_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# Cortex-R5 First Stage Boot Loader
-R5FSBL_DEPENDS = ""
-R5FSBL_MCDEPENDS = "${r5fsbl_mcdepends}"
-R5FSBL_DEPLOY_DIR = "${r5fsbl_deploy_dir}"
-EOF
-  fi
-  if [ -n "${pmu_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# PMU Firware
-PMU_DEPENDS = ""
-PMU_MCDEPENDS = "${pmu_mcdepends}"
-PMU_FIRMWARE_DEPLOY_DIR = "${pmu_firmware_deploy_dir}"
-EOF
-  fi
-  if [ -n "${plm_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# Platform Loader and Manager
-PLM_DEPENDS = ""
-PLM_MCDEPENDS = "${plm_mcdepends}"
-PLM_DEPLOY_DIR = "${plm_deploy_dir}"
-EOF
-  fi
-  if [ -n "${psm_mcdepends}" ]; then
-    cat <<EOF >>"${conf_file}"
-# PSM Firmware
-PSM_DEPENDS = ""
-PSM_MCDEPENDS = "${psm_mcdepends}"
-PSM_FIRMWARE_DEPLOY_DIR = "${psm_firmware_deploy_dir}"
-EOF
-  fi
-  if [ -n "${full_pdi_path}" ]; then
-    pdi_path_dir=$(dirname ${full_pdi_path})
-    pdi_path_base=$(basename ${full_pdi_path})
-    cat <<EOF >>"${conf_file}"
-# Versal PDI
-PDI_PATH_DIR = "${pdi_path_dir}"
-PDI_PATH = "\${PDI_PATH_DIR}/${pdi_path_base}"
-PDI_PATH[vardepsexclude] += "PDI_PATH_DIR"
-EOF
-  fi
-  cat <<EOF >>"${conf_file}"
-# Enable the correct version of the firmware components
-PREFERRED_VERSION_fsbl-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_pmu-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_plm-firmware = "2023_sdt_experimental%"
-PREFERRED_VERSION_psm-firmware = "2023_sdt_experimental%"
-# Exclude BASE_TMPDIR from hash calculations
-BB_HASHEXCLUDE_COMMON:append = " BASE_TMPDIR"
-# Update bootbin to use proper device tree
-BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE').replace('.dts', '.dtb'))}"
-# Remap boot files to ensure the right device tree is listed first
-IMAGE_BOOT_FILES =+ "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE').replace('.dts', '.dtb'))}"
-#### No additional settings should be after the Postamble
-#### Postamble
-PACKAGE_EXTRA_ARCHS:append = "\${@['', ' ${mach_conf//-/_}']['${mach_conf}' != "\${MACHINE}"]}"
-EOF
-}
-parse_cpus() {
-  gen_linux_dts="None"
-  while read -r cpu core domain cpu_name os_hint; do
-    # Skip commented lines and WARNINGs
-    case ${cpu} in
-      \#* | \[WARNING\]:) continue ;;
-    esac
-    case ${cpu} in
-      arm,cortex-a53)
-        # We need a base cortex_a53_baremetal for the FSBL
-        if [ "${core}" == 0 ]; then
-          cortex_a53_baremetal fsbl ${core} ${cpu_name}
-        fi
-        if [ "${os_hint}" == "None" ]; then
-          if [ "${gen_linux_dts}" == "None" ]; then
-            cortex_a53_linux "${domain}"
-            gen_linux_dts="True"
-          fi
-          cortex_a53_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_a53_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            linux*)
-              if [ "${gen_linux_dts}" == "None" ]; then
-                cortex_a53_linux "${domain}"
-                gen_linux_dts="True"
-              fi
-              ;;
-            baremetal*)
-              cortex_a53_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_a53_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-a53 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_a53_baremetal "${domain}"
-          esac
-        fi
-        ;;
-      arm,cortex-a72)
-        if [ "${os_hint}" == "None" ]; then
-          if [ "${gen_linux_dts}" == "None" ]; then
-            cortex_a72_linux "${domain}"
-            gen_linux_dts="True"
-          fi
-          cortex_a72_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_a72_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            linux*)
-              if [ "${gen_linux_dts}" == "None" ]; then
-                cortex_a72_linux "${domain}"
-                gen_linux_dts="True"
-              fi
-              ;;
-            baremetal*)
-              cortex_a72_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_a72_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-a72 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_a72_baremetal "${domain}"
-          esac
-        fi
-        ;;
-      arm,cortex-r5)
-        if [ "${os_hint}" == "None" ]; then
-          # We need a base cortex_r5_baremetal for the FSBL for ZynqMP platform
-          [ "${machine}" = "zynqmp" ] && cortex_r5_baremetal fsbl ${core} ${cpu_name}
-          cortex_r5_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_r5_freertos "${domain}" ${core} ${cpu_name}
-        else
-          case "${os_hint}" in
-            baremetal*)
-              cortex_r5_baremetal "${domain}" ${core} ${cpu_name};;
-            freertos*)
-              cortex_r5_freertos "${domain}" ${core} ${cpu_name};;
-            *)
-              warn "cortex-r5 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
-              cortex_r5_baremetal "${domain}"
-          esac
-        fi
-        ;;
-      xlnx,microblaze)
-        process_microblaze
-        case "${os_hint}" in
-          None | baremetal*)
-            warn "Microblaze for Baremetal ${domain} not yet implemented" ;;
-          Linux)
-            warn "Microblaze for Linux ${domain} not yet implemented" ;;
-          *)
-            warn "Microblaze for unknown OS (${os_hint}), not yet implemented. ${domain}" ;;
-        esac
-        ;;
-      pmu-microblaze)
-        pmu-microblaze ${cpu_name};;
-      pmc-microblaze)
-        pmc-microblaze ${cpu_name};;
-      psm-microblaze)
-        psm-microblaze ${cpu_name};;
-      *)
-        warn "Unknown CPU ${cpu}"
-    esac
-  done <${cpulist}
-}
-gen_local_conf() {
-  cat << EOF >> $1
-# Avoid errors in some baremetal configs as these layers may be present
-# but are not used.  Note the following lines are optional and can be
-# safetly disabled.
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
-# Each multiconfig will define it's own TMPDIR, this is the new default based
-# on BASE_TMPDIR for the Linux build
-TMPDIR = "\${BASE_TMPDIR}/tmp"
-# Use the newly generated MACHINE
-MACHINE = "${mach_conf}"
-# All of the TMPDIRs must be in a common parent directory. This is defined
-# as BASE_TMPDIR.
-# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-BASE_TMPDIR ?= "\${TOPDIR}"
-# The following is the full set of multiconfigs for this configuration
-# A large list can cause a slow parse.
-#BBMULTICONFIG ?= "${multiconf}"
-# Alternatively trim the list to the minimum
-BBMULTICONFIG = "${multiconf_min}"
-EOF
-}
-gen_petalinux_conf() {
-  cd "${config_dir}" || exit
-  (
-    if [ "$machine" == "zynqmp" ]; then
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- petalinuxconfig_xlnx psu_cortexa53_0 ${petalinux_schema} \
-        || error "lopper failed"
-    else
-      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dts}" -- petalinuxconfig_xlnx psv_cortexa72_0 ${petalinux_schema} \
-        || error "lopper failed"
-    fi
-  )
-}
-parse_args "$@"
-lopper=$(command -v lopper)
-lopper_dir=$(dirname "${lopper}")
-lops_dir=$(ls -d $(dirname "${lopper_dir}")/lib/python*/site-packages/lopper/lops | head -n 1)
-embeddedsw=$(dirname "${lopper_dir}")/share/embeddedsw
-system_conf=""
-multiconf=""
-[ -z "${lopper}" ] && error "Unable to find lopper, please source the prestep environment"
-cpulist=$(mktemp)
-priordir=$(pwd)
-cd "${config_dir}" || exit
-mkdir -p dts multiconfig machine/include
-# Get mach_conf name and model name
-(
-  cd dts || error "Unable to cd to dts dir"
-  LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-machine-name.dts" "${system_dts}" \
-    /dev/null > ${cpulist} || error "lopper failed"
-  rm -f "lop-machine-name.dts.dtb"
-)
-read local_mach_conf deviceid model < ${cpulist}
-if [ -z "${mach_conf}" ]; then
-    mach_conf=${local_mach_conf}
-fi
-if [ -z "${dts_path}"]; then
-    dts_path=${local_mach_conf}
-fi
-# Is it relative?  If so, relative to conf/dts
-if [ "${dts_path##/}" = "${dts_path}" ]; then
-    dts_path="dts/${dts_path}"
-else
-    dts_path=$(realpath ${dts_path})
-fi
-# Convert the DTS_PATH into something we can put in a config file
-if [ "${dts_path##/}" = "${dts_path}" ]; then
-    dts_file_path="\${TOPDIR}/conf/${dts_path}"
-else
-    dts_file_path="${dts_path}"
-fi
-# Generate CPU list
-(
-  cd dts || error "Unable to cd to dts dir"
-  LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-xilinx-id-cpus.dts" "${system_dts}" \
-    /dev/null > ${cpulist} || error "lopper failed"
-  rm -f "lop-xilinx-id-cpus.dts.dtb"
-)
-detect_machine
-# Now that we know the machine name, we can create the directory
-mkdir -p machine/include/${mach_conf}
-mkdir -p ${dts_path}
-echo "System Configuration:"
-echo "MODEL       = \"${model}\""
-echo "MACHINE     = \"${mach_conf}\""
-echo "DEVICE_ID   = \"${deviceid}\""
-echo "SOC_FAMILY  = \"${machine}\""
-echo "SOC_VARIANT = \"${soc_variant}\""
-echo "CPUs:"
-dump_cpus "            = "
-echo
-info "Generating configuration..."
-parse_cpus
-generate_machine
-cd ${priordir}
-if [ -z "${localconf}" ]; then
-  echo
-  echo "To enable this, add the following to your local.conf:"
-  echo
-  tmpfile=$(mktemp)
-  gen_local_conf ${tmpfile}
-  cat $tmpfile
-  rm $tmpfile
-else
-  echo
-  echo "Configuration for local.conf written to ${localconf}"
-  echo
-  gen_local_conf ${localconf}
-fi
-if [ -n "${petalinux_schema}" ]; then
-  echo
-  echo "Generating petalinux config file:"
-  echo
-  gen_petalinux_conf
-fi
-# Cleanup our temp file
-rm -rf ${cpulist} ${config_dir}/CMakeLists.txt ${config_dir}/DRVLISTConfig.cmake
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
deleted file mode 100644
index dc7d647a..00000000
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-DESCRIPTION = "Xilinx Device Tree based configuration generator"
-LICENSE = "MIT"
-SRC_URI += " \
-    file://dt-processor.sh \
-    file://README-setup \
-"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-TOOLCHAIN_TARGET_TASK = ""
-TOOLCHAIN_HOST_TASK = "\
-    nativesdk-sdk-provides-dummy \
-    nativesdk-lopper \
-    nativesdk-xilinx-lops \
-    nativesdk-esw-conf \
-    "
-MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
-PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
-PACKAGE_ARCHS = ""
-TARGET_ARCH = "none"
-TARGET_OS = "none"
-SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}"
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-xilinx-nativesdk-prestep-${DISTRO_VERSION}"
-SDK_TITLE = "Device Tree setup tools"
-RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
-EXCLUDE_FROM_WORLD = "1"
-inherit populate_sdk
-inherit toolchain-scripts-base
-inherit nopackages
-deltask install
-deltask populate_sysroot
-do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
-REAL_MULTIMACH_TARGET_SYS = "none"
-# Needed to ensure README-setup and dt-processor.sh are available
-addtask do_populate_sdk after do_unpack
-create_sdk_files:append () {
-        install -m 0644 ${WORKDIR}/README-setup ${SDK_OUTPUT}/${SDKPATH}/.
-        install -m 0755 ${WORKDIR}/dt-processor.sh ${SDK_OUTPUT}/${SDKPATH}/.
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
-        # Generate new (mini) sdk-environment-setup file
-        script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
-        touch $script
-        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script
-        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-        echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
-        echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
-        toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
-        cat >> $script <<EOF
-if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
-        for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do
-                . \$envfile
-        done
-fi
-# We have to unset this else it can confuse oe-selftest and other tools
-# which may also use the overlapping namespace.
-unset OECORE_NATIVE_SYSROOT
-EOF
-        if [ "${SDKMACHINE}" = "i686" ]; then
-                echo 'export NO32LIBS="0"' >>$script
-                echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script
-                echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script
-        fi
-}
-# buildtools-tarball doesn't need config site
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
-# The recipe doesn't need any default deps
-INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_2024.1.bb
index 7edd2d9d..7edd2d9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_2024.1.bb
index 1846b291..1846b291 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_2024.1.bb
index 47111dc5..47111dc5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_2024.1.bb
index 68a26f45..68a26f45 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_2024.1.bb
index c385d13f..c385d13f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_2024.1.bb
index 04c2c151..04c2c151 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_2024.1.bb
index 0b635859..0b635859 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_2024.1.bb
index 4aa716e7..4aa716e7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_2024.1.bb
index ff2eae91..ff2eae91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_2024.1.bb
index b34dedb0..b34dedb0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_2024.1.bb
index 2866c02b..2866c02b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_2024.1.bb
index 15268629..15268629 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_2024.1.bb
index a3145467..a3145467 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram_2024.1.bb
index 3c81c619..3c81c619 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_2024.1.bb
index 115852fa..115852fa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can_2024.1.bb
index eb7fc473..eb7fc473 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_2024.1.bb
index 84276569..84276569 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_2024.1.bb
index 5f2e6ea8..5f2e6ea8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_2024.1.bb
index 574dc563..574dc563 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps_2024.1.bb
index c9f61cd2..c9f61cd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_2024.1.bb
index 6ffdf85d..6ffdf85d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_2024.1.bb
index 3cb675bc..3cb675bc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb
new file mode 100644
index 00000000..71ffdc32
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz-example_2024.1.bb
@@ -0,0 +1,5 @@
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "clk-wiz"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clk_wiz/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_2024.1.bb
index ae0453a1..ae0453a1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
index f9c5bce6..f9c5bce6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_2024.1.bb
index 4bddb2c0..3a464480 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_2024.1.bb
@@ -8,3 +8,6 @@ DEPENDS += "xilstandalone "
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clockps/src/"
 ESW_COMPONENT_NAME = "libclockps.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/common_2024.1.bb
index 541ff225..10635f7f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/common_2024.1.bb
@@ -13,11 +13,13 @@ PACKAGECONFIG[clockps] = "${RECIPE_SYSROOT}/usr/lib/libclockps.a,,clockps,,"
 PACKAGECONFIG[scugic] = "${RECIPE_SYSROOT}/usr/lib/libscugic.a,,scugic,,"
 PACKAGECONFIG[intc] = "${RECIPE_SYSROOT}/usr/lib/libintc.a,,intc,,"
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/common/src/"
+ESW_COMPONENT_SRC = "/lib/bsp/standalone/src/common/intr/"
 ESW_COMPONENT_NAME = "libcommon.a"
 do_configure:prepend() {
+    (
+    cd ${S}/${ESW_COMPONENT_SRC}/
    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/intc/src/
    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/scugic/src/
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_2024.1.bb
index 9110b51e..9110b51e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_2024.1.bb
index 5706967a..5706967a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_2024.1.bb
index 8283ce8d..8283ce8d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_2024.1.bb
index 4728b6c5..4728b6c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_2024.1.bb
index dd70e09d..dd70e09d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_2024.1.bb
index 4b794d22..4b794d22 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb
new file mode 100644
index 00000000..fd01b757
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "dfeccf"
+DEPENDS += " dfeccf"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeccf/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb
new file mode 100644
index 00000000..86a55b9f
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeccf_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dfeccf"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeccf/src/"
+ESW_COMPONENT_NAME = "libdfeccf.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb
new file mode 100644
index 00000000..0f4d45be
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "dfeequ"
+DEPENDS += " dfeequ"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeequ/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb
new file mode 100644
index 00000000..8ad43c1b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeequ_2024.1.bb
@@ -0,0 +1,15 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dfeequ"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeequ/src/"
+ESW_COMPONENT_NAME = "libdfeequ.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb
new file mode 100644
index 00000000..9149e9c4
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "dfemix"
+DEPENDS += " dfemix"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfemix/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb
new file mode 100644
index 00000000..31c7b8ed
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfemix_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dfemix"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfemix/src/"
+ESW_COMPONENT_NAME = "libdfemix.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb
new file mode 100644
index 00000000..661c2768
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "dfeofdm"
+DEPENDS += " dfeofdm"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeofdm/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb
new file mode 100644
index 00000000..a02ceae7
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeofdm_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dfeofdm"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeofdm/src/"
+ESW_COMPONENT_NAME = "libdfeofdm.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb
new file mode 100644
index 00000000..10ac2029
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "dfeprach"
+DEPENDS += " dfeprach"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeprach/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb
new file mode 100644
index 00000000..0890ff3b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfeprach_2024.1.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dfeprach"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfeprach/src/"
+ESW_COMPONENT_NAME = "libdfeprach.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_2024.1.bb
index 974dd48b..974dd48b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_2024.1.bb
index 81f2157b..81f2157b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_2024.1.bb
index 40d08e4b..40d08e4b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_2024.1.bb
index 1dcd8404..1dcd8404 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb
new file mode 100644
index 00000000..ab63d3a1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dp14_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dp14"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14/src/"
+ESW_COMPONENT_NAME = "libdp14.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb
new file mode 100644
index 00000000..4e98b2e4
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dp14rxss_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "dp14rxss"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14rxss/src/"
+ESW_COMPONENT_NAME = "libdp14rxss.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_2024.1.bb
index 3adb88a6..3adb88a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_2024.1.bb
index 87cca884..87cca884 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_2024.1.bb
index 6ed717fb..6ed717fb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_2024.1.bb
index 9ceb477f..9ceb477f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_2024.1.bb
index 2c57eafe..2c57eafe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_2024.1.bb
index 8ed85984..8ed85984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb
new file mode 100644
index 00000000..0f46f99b
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emc_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "emc"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emc/src/"
+ESW_COMPONENT_NAME = "libemc.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_2024.1.bb
index 3f79cfec..3f79cfec 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_2024.1.bb
index 83a746b7..83a746b7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_2024.1.bb
index cc2e1703..cc2e1703 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_2024.1.bb
index 4bd63d1e..4bd63d1e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb
new file mode 100644
index 00000000..37d70f6a
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/hwicap_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "hwicap"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/hwicap/src/"
+ESW_COMPONENT_NAME = "libhwicap.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb
new file mode 100644
index 00000000..27333e13
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i2srx_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "i2srx"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i2srx/src/"
+ESW_COMPONENT_NAME = "libi2srx.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb
new file mode 100644
index 00000000..ca09a7f0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i2stx_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "i2stx"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i2stx/src/"
+ESW_COMPONENT_NAME = "libi2stx.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb
new file mode 100644
index 00000000..699b9d97
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx-example_2024.1.bb
@@ -0,0 +1,5 @@
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "i3cpsx"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i3cpsx/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb
new file mode 100644
index 00000000..7b88520d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/i3cpsx_2024.1.bb
@@ -0,0 +1,13 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "i3cpsx"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/i3cpsx/src/"
+ESW_COMPONENT_NAME = "libi3cpsx.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_2024.1.bb
index b781b82c..b781b82c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic_2024.1.bb
index 7011f90b..7011f90b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_2024.1.bb
index e9df1cbd..e9df1cbd 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_2024.1.bb
index e96dc2ac..e96dc2ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_2024.1.bb
index 0b4b95a8..0b4b95a8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc_2024.1.bb
index 331c2e32..331c2e32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_2024.1.bb
index 1f625521..1f625521 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_2024.1.bb
index 0b31601d..0b31601d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_2024.1.bb
index 3e2ccc0b..3e2ccc0b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_2024.1.bb
index 6b1c211a..6b1c211a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_2024.1.bb
index 1fb76b18..1fb76b18 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_2024.1.bb
index 3c4870b4..3c4870b4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_2024.1.bb
index 5c1b8393..5c1b8393 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_2024.1.bb
index 64979470..64979470 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_2024.1.bb
index f13a7e54..f13a7e54 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_2024.1.bb
index fc0527da..fc0527da 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_2024.1.bb
index 98abc948..98abc948 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb
new file mode 100644
index 00000000..ce3f7898
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandps_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "nandps"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/nandps/src/"
+ESW_COMPONENT_NAME = "libnandps.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_2024.1.bb
index 8b7a88b5..8b7a88b5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_2024.1.bb
index 6d2a71c5..6d2a71c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_2024.1.bb
index 0ded4fd2..0ded4fd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_2024.1.bb
index f0548efc..f0548efc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_2024.1.bb
index 23895fba..23895fba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_2024.1.bb
index ccedb1df..ccedb1df 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb
new file mode 100644
index 00000000..12390ae2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/prc_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "prc"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/prc/src/"
+ESW_COMPONENT_NAME = "libprc.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb
new file mode 100644
index 00000000..9ea7b2d8
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/prd_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "prd"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/prd/src/"
+ESW_COMPONENT_NAME = "libprd.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_2024.1.bb
index 674b879a..674b879a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_2024.1.bb
index fa28d901..fa28d901 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_2024.1.bb
index 21231450..21231450 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_2024.1.bb
index 5b4b1614..5b4b1614 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_2024.1.bb
index 243393bb..243393bb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_2024.1.bb
index c753c666..c753c666 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb
new file mode 100644
index 00000000..973e5177
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc-example_2024.1.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Advanced Micro Devices, Inc.  All rights reserved.
+inherit esw_examples features_check
+REQUIRED_MACHINE_FEATURES = "rfdc"
+DEPENDS += " rfdc"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rfdc/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb
new file mode 100644
index 00000000..cfc106b6
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rfdc_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "rfdc"
+inherit esw python3native
+DEPENDS += "xilstandalone libmetal"
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rfdc/src/"
+ESW_COMPONENT_NAME = "librfdc.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_2024.1.bb
index ac386c4c..ac386c4c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_2024.1.bb
index 7b96bf16..7b96bf16 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_2024.1.bb
index cbef3ce9..cbef3ce9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_2024.1.bb
index f079354d..f079354d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb
new file mode 100644
index 00000000..9e101058
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scutimer_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "scutimer"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scutimer/src/"
+ESW_COMPONENT_NAME = "libscutimer.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb
new file mode 100644
index 00000000..757a5de1
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scuwdt_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "scuwdt"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scuwdt/src/"
+ESW_COMPONENT_NAME = "libscuwdt.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb
new file mode 100644
index 00000000..e4f61219
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sd-fec_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "sd-fec"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sd_fec/src/"
+ESW_COMPONENT_NAME = "libsd_fec.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_2024.1.bb
index 550d664b..550d664b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_2024.1.bb
index 4caf0e63..4caf0e63 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb
new file mode 100644
index 00000000..3e564725
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spi_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "spi"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/spi/src/"
+ESW_COMPONENT_NAME = "libspi.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_2024.1.bb
index 71ead5d3..71ead5d3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips_2024.1.bb
index ca02fda0..ca02fda0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_2024.1.bb
index 5bc007ad..5bc007ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_2024.1.bb
index 5353f6f8..5353f6f8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_2024.1.bb
index 2c76a978..2c76a978 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_2024.1.bb
index 871a77a3..871a77a3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_2024.1.bb
index edce2794..edce2794 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_2024.1.bb
index 2c693809..2c693809 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb
new file mode 100644
index 00000000..d8dcff08
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tft_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "tft"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/tft/src/"
+ESW_COMPONENT_NAME = "libtft.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_2024.1.bb
index dbf3d364..dbf3d364 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_2024.1.bb
index dd91fed7..dd91fed7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_2024.1.bb
index 8224d6fe..8224d6fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_2024.1.bb
index cf94a9d0..cf94a9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_2024.1.bb
index 84c5618c..84c5618c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_2024.1.bb
index 77d000db..77d000db 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb
new file mode 100644
index 00000000..1651ede2
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsv_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "trngpsv"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/trngpsv/src/"
+ESW_COMPONENT_NAME = "libtrngpsv.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb
new file mode 100644
index 00000000..7699dfe5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trngpsx_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "trngpsx"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/trngpsx/src/"
+ESW_COMPONENT_NAME = "libtrngpsx.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_2024.1.bb
index d294c383..d294c383 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_2024.1.bb
index ea520656..ea520656 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_2024.1.bb
index 9aa0f598..9aa0f598 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_2024.1.bb
index 5998e092..5998e092 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_2024.1.bb
index d81ce77b..d81ce77b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_2024.1.bb
index a08763cb..a08763cb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_2024.1.bb
index bbff466d..bbff466d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_2024.1.bb
index 932be9eb..932be9eb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_2024.1.bb
index 78f878a6..78f878a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_2024.1.bb
index 01e48caa..01e48caa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_2024.1.bb
index 0d4e113a..0d4e113a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb_2024.1.bb
index 9dac8cba..9dac8cba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb
new file mode 100644
index 00000000..c4a2fff0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbps_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "usbps"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/usbps/src/"
+ESW_COMPONENT_NAME = "libusbps.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_2024.1.bb
index 4eb9bc93..4eb9bc93 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_2024.1.bb
index 194b1f0f..194b1f0f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_2024.1.bb
index 068a43e9..068a43e9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_2024.1.bb
index 741fdd91..741fdd91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_2024.1.bb
index cf2cdf6f..cf2cdf6f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_2024.1.bb
index 79ef55f2..79ef55f2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_2024.1.bb
index fc13c194..fc13c194 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_2024.1.bb
index 91ee34d8..91ee34d8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_2024.1.bb
index 87a1be53..87a1be53 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_2024.1.bb
index d88ac592..d88ac592 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_2024.1.bb
index 4d5dcf03..4d5dcf03 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_2024.1.bb
index 8cf95c9d..8cf95c9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_2024.1.bb
index 1731f984..1731f984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb
new file mode 100644
index 00000000..1e592d40
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmi-common_2024.1.bb
@@ -0,0 +1,11 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmi-common"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmi_common/src/"
+ESW_COMPONENT_NAME = "libv_hdmi_common.a"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb
new file mode 100644
index 00000000..d3d601cb
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmiphy1_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmiphy1"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmiphy1/src/"
+ESW_COMPONENT_NAME = "libv_hdmiphy1.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb
new file mode 100644
index 00000000..f2b576cd
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirx1_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmirx1"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirx1/src/"
+ESW_COMPONENT_NAME = "libv_hdmirx1.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb
new file mode 100644
index 00000000..faf57614
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmirxss1_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmirxss1"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirxss1/src/"
+ESW_COMPONENT_NAME = "libv_hdmirxss1.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb
new file mode 100644
index 00000000..7070235e
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitx1_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmitx1"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitx1/src/"
+ESW_COMPONENT_NAME = "libv_hdmitx1.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb
new file mode 100644
index 00000000..de4f4ad9
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hdmitxss1_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-hdmitxss1"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitxss1/src/"
+ESW_COMPONENT_NAME = "libv_hdmitxss1.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_2024.1.bb
index b239380e..b239380e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_2024.1.bb
index f5ad5f4e..f5ad5f4e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_2024.1.bb
index 8bafbf00..8bafbf00 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_2024.1.bb
index acc19bd0..acc19bd0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_2024.1.bb
index 28660316..28660316 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_2024.1.bb
index bd725dbe..bd725dbe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_2024.1.bb
index 2859de79..2859de79 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_2024.1.bb
index 77cf9189..77cf9189 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_2024.1.bb
index 6ea70db1..6ea70db1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_2024.1.bb
index 45913cdc..45913cdc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_2024.1.bb
index 9528d2e0..9528d2e0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb
new file mode 100644
index 00000000..f908ce55
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-filter_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-warp-filter"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_warp_filter/src/"
+ESW_COMPONENT_NAME = "libv_warp_filter.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb
new file mode 100644
index 00000000..ff04ec35
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-warp-init_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "v-warp-init"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_warp_init/src/"
+ESW_COMPONENT_NAME = "libv_warp_init.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_2024.1.bb
index 278dee8a..278dee8a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb
new file mode 100644
index 00000000..1a06cf60
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vphy_2024.1.bb
@@ -0,0 +1,14 @@
+inherit features_check
+REQUIRED_MACHINE_FEATURES = "vphy"
+inherit esw python3native
+DEPENDS += "xilstandalone "
+ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/vphy/src/"
+ESW_COMPONENT_NAME = "libvphy.a"
+addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
+do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_2024.1.bb
index d9050ec4..d9050ec4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_2024.1.bb
index 26b2852f..26b2852f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_2024.1.bb
index a82ae5ee..a82ae5ee 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_2024.1.bb
index 610a7476..610a7476 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_2024.1.bb
index 2c900038..2c900038 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_2024.1.bb
index cad6ca20..cad6ca20 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_2024.1.bb
index 33331c32..33331c32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_2024.1.bb
index f8878144..f8878144 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_2024.1.bb
index 85800a27..85800a27 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_2024.1.bb
index 26983a8f..26983a8f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_2024.1.bb
index cab8e9d0..cab8e9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_2024.1.bb
index d6a87183..d6a87183 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_2024.1.bb
index 491eb07c..491eb07c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_2024.1.bb
index e74e3279..e74e3279 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_2024.1.bb
index e987f560..e987f560 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_2024.1.bb
index 22d7955e..22d7955e 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_2024.1.bb
index 2ec1d6cd..2eb08307 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_2024.1.bb
@@ -25,14 +25,10 @@ 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_configure:prepend() {
-    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
-    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/
-}
 do_compile() {
   # Combines the .a archives produced by all of the dependent items
   cd ${RECIPE_SYSROOT}/usr/lib/
@@ -48,3 +44,12 @@ do_compile() {
   ${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-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_2024.1.bb
index 93f0b1e8..e70dfa11 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_2024.1.bb
@@ -1,17 +1,17 @@
 inherit esw python3native
-ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip213/src/"
+ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip220/src/"
-ESW_COMPONENT_NAME = "liblwip213.a"
+ESW_COMPONENT_NAME = "liblwip220.a"
 DEPENDS += "libxil"
 DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
-EXTRA_OECMAKE += "-Dlwip213_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip220_api_mode=RAW_API"
-EXTRA_OECMAKE += "-Dlwip213_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip220_dhcp_does_arp_check=ON"
-EXTRA_OECMAKE += "-Dlwip213_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip220_dhcp=ON"
-EXTRA_OECMAKE += "-Dlwip213_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip220_pbuf_pool_size=2048"
-EXTRA_OECMAKE += "-Dlwip213_ipv6_enable=OFF"
+EXTRA_OECMAKE += "-Dlwip220_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip213_api_mode=SOCKET_API"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip220_api_mode=SOCKET_API"
 do_configure:prepend() {
    # This script should also not rely on relative paths and such
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
index cae39d17..cae39d17 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
index b8dc3b33..b8dc3b33 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
index a3fb1560..a3fb1560 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_2024.1.bb
index 6eaf40ac..6eaf40ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
index 11b03c1b..11b03c1b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
index 600369ad..600369ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_2024.1.bb
index 77115515..77115515 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb
new file mode 100644
index 00000000..bd001f64
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.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-experimental/recipes-libraries/xilnvm_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_2024.1.bb
new file mode 100644
index 00000000..8aa1250d
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_2024.1.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-experimental/recipes-libraries/xilnvm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_git.bb
deleted file mode 100644
index 9114aa72..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/src/"
-ESW_COMPONENT_NAME = "libxilnvm.a"
-DEPENDS += "libxil xiltimer xilplmi"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_2024.1.bb
index c008b069..c008b069 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpdi_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.bb
new file mode 100644
index 00000000..cb3b7831
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_2024.1.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-experimental/recipes-libraries/xilplmi_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_git.bb
deleted file mode 100644
index 35a1efb0..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilplmi_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/"
-ESW_COMPONENT_NAME = "libxilplmi.a"
-DEPENDS += "xilstandalone libxil cfupmc"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_2024.1.bb
index 69b505c8..69b505c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
index ca0abc12..bbe2920b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
@@ -2,7 +2,11 @@ inherit esw deploy
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/examples/"
-DEPENDS += "xilpuf xilsecure"
+PACKAGECONFIG ??= "client server"
+PACKAGECONFIG[client]  ="-DXILPUF_Mode="client",,"
+PACKAGECONFIG[server]  ="-DXILPUF_Mode="server",,"
+DEPENDS += "xilpuf xilsecure xilmailbox xilnvm xilplmi"
 do_configure:prepend() {
    (
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_2024.1.bb
index 81bee095..84765a39 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_2024.1.bb
@@ -3,4 +3,8 @@ 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-experimental/recipes-libraries/xilsecure-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
index 993794b5..a2b4b7a5 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
@@ -2,6 +2,10 @@ 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() {
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.bb
new file mode 100644
index 00000000..be22ba90
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_2024.1.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-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
deleted file mode 100644
index 0001d3fb..00000000
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
-ESW_COMPONENT_NAME = "libxilsecure.a"
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''} ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_2024.1.bb
index 3631d7f0..3631d7f0 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsem_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
index a4a81c8b..a42d6fd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
@@ -1,29 +1,29 @@
-inherit esw deploy
+inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/"
+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"
-DEPENDS += "xilnvm"
+DEPENDS += "xilskey xilsecure"
-do_configure:prepend() {
+do_configure:prepend() {
-    (
+    (
-    cd ${S}
+    cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
-    )
+    )
-}
+}
-ESW_CUSTOM_LINKER_FILE ?= "None"
+ESW_CUSTOM_LINKER_FILE ?= "None"
-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
-do_install() {
+do_install() {
-    install -d ${D}/${base_libdir}/firmware
+    install -d ${D}/${base_libdir}/firmware
-    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
-}
+}
-do_deploy() {
+do_deploy() {
-    install -d ${DEPLOYDIR}/${BPN}/
+    install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/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
+addtask deploy before do_build after do_package
-FILES:${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_2024.1.bb
index 84782554..84782554 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_2024.1.bb
index facbfbaa..a4b0037b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_2024.1.bb
@@ -14,5 +14,8 @@ do_configure:prepend() {
    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-experimental/recipes-libraries/xiltimer_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_2024.1.bb
index dd19671d..dd19671d 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_2024.1.bb
diff --git a/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend b/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend
new file mode 100644
index 00000000..5434c9a5
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend
@@ -0,0 +1 @@
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx.inc
diff --git a/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend b/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
new file mode 100644
index 00000000..88b45295
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend
@@ -0,0 +1 @@
+require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx.inc