Merge remote-tracking branch 'origin/rel-v2023.1'

Resolved conflicts Preserved 2022* versions Signed-off-by: Mark Hatle <mark.hatle@amd.com>
author: Mark Hatle <mark.hatle@amd.com> 2023-05-18 13:18:29 -0600
committer: Mark Hatle <mark.hatle@amd.com> 2023-05-18 14:59:03 -0600
commit: 96363a1fada8f5dca874917e47899e7f6dd26b43 (patch)
tree: 60a031689d7c6bb11640136a00e2e44eedfc3868 /meta-xilinx-standalone-experimental
parent: fe4b15d97e0b5ce73cd3186ac3e380df07c9d1ca (diff)
parent: d4732aa636e6764c64030083a20975283c2352d5 (diff)
download: meta-xilinx-96363a1fada8f5dca874917e47899e7f6dd26b43.tar.gz
187 files changed, 948 insertions, 717 deletions
diff --git a/meta-xilinx-standalone-experimental/README.md b/meta-xilinx-standalone-experimental/README.md
index 99675b0a..8014265b 100644
--- a/meta-xilinx-standalone-experimental/README.md
+++ b/meta-xilinx-standalone-experimental/README.md
@@ -14,36 +14,47 @@ parts and pieces.
 **Note:** to use this layer you must REMOVE meta-xilinx-tools from your
 project.  meta-xilinx-tools is not compatible with this experimental
 approach.  You may also have to remove other layers that depend
-on meta-xilinx-tools, such as meta-som.
+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 the 'meta-xilinx-setup'
-SDK.  This SDK is passed a device tree, constructed from DTG++ and
+SDK.  This SDK is passed a device tree, constructed from System Device tree and
 produces a number of configuration files.
-To build the setup SDK:
+1. Remove meta-xilinx-tools, meta-kria and meta-system-controller, then add the decoupling layer
+```
-MACHINE=qemux86-64 bitbake meta-xilinx-setup
+$ bitbake-layers remove-layer meta-xilinx-tools
+$ bitbake-layers remove-layer meta-kria
-To install the setup SDK:
+$ bitbake-layers remove-layer meta-system-controller
+$ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-standalone-experimental
-./tmp/deploy/sdk/x86_64-xilinx-nativesdk-prestep-2021.2.sh -d prestep -y
+```
+2. Build the setup SDK
+```
+$ bitbake meta-xilinx-setup
+```
+3. Install the setup SDK:
+```
+$ .${TMPDIR}/tmp/deploy/sdk/x86_64-xilinx-nativesdk-prestep-2023.1....sh -d prestep -y
+```
 Then follow the instructions in the 'prestep/README-setup' file.
 ## Dependencies
 This layer depends on:
-        URI: git://git.openembedded.org/bitbake
+        URI: https://git.yoctoproject.org/poky
+        layers: meta, meta-poky
+        branch: langdale
-        URI: git://git.openembedded.org/openembedded-core
+        URI: https://git.openembedded.org/meta-openembedded
-        layers: meta
+        layers: meta-oe
-        branch: master or xilinx current release version (e.g. hosister)
+        branch: langdale
-        URI: git://git.yoctoproject.org/meta-xilinx.git
+        URI:
+        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: master or xilinx current release version (e.g. hosister)
+        branch: langdale or amd xilinx release version (e.g. rel-v2023.1)
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index f133662a..febdebad 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -26,7 +26,7 @@ COMPATIBLE_HOST = ".*-elf"
 COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
 CONFIG_DTFILE ??= ""
-DTS_FILE = "${DEPLOY_DIR_IMAGE}/devicetree/${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+DTS_FILE = "${DEPLOY_DIR_IMAGE}/devicetree/${@os.path.basename(d.getVar('CONFIG_DTFILE').replace('.dts','.dtb'))}"
 DEPENDS += "python3-pyyaml-native lopper-native device-tree python3-dtc-native"
@@ -48,9 +48,9 @@ def get_xlnx_cmake_machine(fam, d):
 def get_xlnx_cmake_processor(tune, machine, d):
    cmake_processor = tune
    if tune.startswith('microblaze'):
-        if (machine == 'microblaze-pmu'):
+        if (machine == 'psu_pmu_0'):
            cmake_processor = 'pmu_microblaze'
-        elif (machine == 'microblaze-plm'):
+        elif (machine == 'psv_pmc_0'):
            cmake_processor = 'plm_microblaze'
        else:
            cmake_processor = 'microblaze'
@@ -79,6 +79,11 @@ cmake_do_generate_toolchain_file:append() {
    # Will need this in the future to make cmake understand esw variables
    # 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})
+    if ("${XLNX_CMAKE_PROCESSOR}" STREQUAL "plm_microblaze")
+        set( CMAKE_BUILD_TYPE Release)
+    endif()
    add_definitions( "${XLNX_CMAKE_BSP_VARS}" )
 EOF
 }
@@ -119,7 +124,7 @@ python do_generate_driver_data() {
    src_dir = glob.glob(d.getVar('OECMAKE_SOURCEPATH'))
    machine = d.getVar('ESW_MACHINE')
-    driver_name = d.getVar('REQUIRED_DISTRO_FEATURES')
+    driver_name = d.getVar('REQUIRED_MACHINE_FEATURES')
    if len(system_dt) == 0:
        bb.error("Couldn't find device tree %s" % d.getVar('DTS_FILE'))
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
index 508da535..43e78191 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
@@ -6,7 +6,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
index 2b461993..b252e609 100644
--- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
+++ b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
@@ -2,11 +2,13 @@
 # meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
 # Make it clear decoupling is 'experimental' in the version
-ESW_VER = "experimental"
+ESW_VER = "2023.1_sdt_experimental"
 REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https"
-ESW_BRANCH[experimental] = "xlnx_rel_v2022.1_sdt_experimental_beta"
+ESW_BRANCH[2023.1_sdt_experimental] = "xlnx_rel_v2023.1_sdt"
-ESW_REV[experimental] = "2f93defe078000965c8f7203da11817c9f0982d1"
+ESW_REV[2023.1_sdt_experimental] = "b47bfef27d7af0690add590b9c98e6fc51a1a1f6"
 LIC_FILES_CHKSUM[master] = '7c92de7a21a6613265035c28f4a92f48'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1_sdt_experimental_beta] = 'e26f53a7d6f58f4b1a9687099417225c'
+LIC_FILES_CHKSUM[xlnx_rel_v2023.1_sdt_experimental] = 'ce611484168a6000bd35df68fc4f4290'
+LIC_FILES_CHKSUM[xlnx_rel_v2023.1_sdt] = 'ce611484168a6000bd35df68fc4f4290'
diff --git a/meta-xilinx-standalone-experimental/conf/layer.conf b/meta-xilinx-standalone-experimental/conf/layer.conf
index 54098905..12734173 100644
--- a/meta-xilinx-standalone-experimental/conf/layer.conf
+++ b/meta-xilinx-standalone-experimental/conf/layer.conf
@@ -12,6 +12,9 @@ BBFILE_COLLECTIONS += "xilinx-standalone-exp"
 BBFILE_PATTERN_xilinx-standalone-exp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_xilinx-standalone-exp = "7"
+# Allow other layers to find the root of this layer if necessary
+META_XILINX_STANDALONE_EXP_PATH = "${LAYERDIR}"
 LAYERDEPENDS_xilinx-standalone-exp = "core \
        xilinx \
        xilinx-standalone \
@@ -20,3 +23,6 @@ LAYERDEPENDS_xilinx-standalone-exp = "core \
        "
 LAYERSERIES_COMPAT_xilinx-standalone-exp = "mickledore"
+# Aid debugging, show where the device trees are we are using
+BUILDCFG_VARS:append = " SYSTEM_DTFILE CONFIG_DTFILE"
diff --git a/meta-xilinx-standalone-experimental/conf/multiconfig/pmumc.conf b/meta-xilinx-standalone-experimental/conf/multiconfig/pmumc.conf
deleted file mode 100644
index 756ea94a..00000000
--- a/meta-xilinx-standalone-experimental/conf/multiconfig/pmumc.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-MACHINE = "microblaze-pmu"
-DISTRO = "xilinx-standalone"
-TMPDIR = "${TOPDIR}/tmp-${MACHINE}-${TCLIBC}"
-# These should be temporary until the dtg repo has the correct design
-HDF_BASE ?= "file://"
-HDF_PATH ?= "${TOPDIR}/system.dsa"
-HDF_EXT ?= "dsa"
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_git.bb
index 8ffb01cb..d62779ae 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_git.bb
@@ -10,9 +10,10 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    install -m 0644 ${CUSTOM_SRCFILE}/* ${S}/${ESW_COMPONENT_SRC}/
+    cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
    )
 }
@@ -25,10 +26,10 @@ inherit image-artifact-names
 CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-ESW_COMPONENT ??= "executable.elf"
+ESW_COMPONENT ??= "empty_application.elf"
 do_compile:append() {
-    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin
+    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/empty_application.bin
 }
 do_install() {
@@ -38,7 +39,7 @@ 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
-    install -m 0644 ${B}/executable.bin ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.bin
+    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
 }
 addtask deploy before do_build after do_install
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
index f97240f8..8106684b 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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
    )
 }
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
index 5e58c601..f7eae1dc 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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
    )
 }
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
index e4a2b041..51b89b8e 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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
    )
 }
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
index bf892954..606fd01e 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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
    )
 }
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
index 0a28d3df..7f9d86e2 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index 0212dab2..4fc02f36 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index 16d9d030..1de5ef8c 100644
--- 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
@@ -10,8 +10,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index 84909f18..c59d816e 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index eea50f60..b9834e34 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index fac6ace0..0acc4b8f 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index 0c1b1f9b..00a9eaa6 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index 8973ee60..5f54caf9 100644
--- 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
@@ -8,8 +8,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
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
index f2af00f6..1ece5a8c 100644
--- 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
@@ -10,15 +10,16 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
-    install -m 0755 memory.ld ${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}/memory_test* ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/memory_tests* ${D}/${base_libdir}/firmware
 }
 inherit image-artifact-names
@@ -28,13 +29,13 @@ MEMORY_TESTS_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERS
 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_test.elf ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.elf
+    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_test.elf ${WORKDIR}/package/${base_libdir}/firmware/memory_test.bin
+    ${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_test.bin ${DEPLOYDIR}/${MEMORY_TESTS_BASE_NAME}.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_test*"
+FILES:${PN} = "${base_libdir}/firmware/memory_tests*"
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_git.bb
index 21422739..b6b15d5a 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_git.bb
@@ -10,8 +10,9 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${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}
    )
 }
@@ -29,13 +30,9 @@ python do_generate_app_data() {
    if len(src_dir) == 0:
        bb.error("Couldn't find source dir %s" % d.getVar('OECMAKE_SOURCEPATH'))
-    driver_name = d.getVar('REQUIRED_DISTRO_FEATURES')
+    driver_name = d.getVar('REQUIRED_MACHINE_FEATURES')
-    command = ["lopper"] + ["-f"] + [system_dt[0]] + ["--"] + ["baremetal_gentestapp_xlnx"] + [machine] + [srcdir[0]]
+    command = ["lopper"] + ["-f"] + ["-O"] + [src_dir[0]] + [system_dt[0]] + ["--"] + ["baremetal_gentestapp_xlnx"] + [machine] + [srcdir[0]]
    subprocess.run(command, check = True)
-    with open("file_list.txt", 'r') as fd:
-         for line in fd:
-             command = ["install"] + ["-m"] + ["0755"] + [line.strip()] + [src_dir[0]]
-             subprocess.run(command, check = True)
 }
 addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
 do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
@@ -46,10 +43,10 @@ inherit image-artifact-names
 PERIPHERAL_TEST_BASE_NAME ?= "${PERIPHERAL_TEST_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
-ESW_COMPONENT ??= "executable.elf"
+ESW_COMPONENT ??= "peripheral_tests.elf"
 do_compile:append() {
-    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin
+    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/peripheral_tests.bin
 }
 do_install() {
@@ -59,7 +56,7 @@ do_install() {
 do_deploy() {
    install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.elf
    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    install -m 0644 ${B}/executable.bin ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.bin
+    install -m 0644 ${B}/peripheral_tests.bin ${DEPLOYDIR}/${PERIPHERAL_TEST_BASE_NAME}.bin
    ln -sf ${PERIPHERAL_TEST_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
 }
 addtask deploy before do_build after do_install
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
index 43dcc106..d40f3cdb 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
@@ -49,6 +49,7 @@ do_configure:prepend() {
    else
        bbwarn "Using the default psu_init.h, this may not work correctly."
    fi
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
 }
 do_install() {
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
index 8a72a184..cc6d757f 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
@@ -10,6 +10,13 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
 ESW_COMPONENT = "versal_plm.elf"
+do_configure:prepend() {
+    (
+    cd ${S}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
 do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
index dd0a3d92..b5908d46 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
@@ -8,7 +8,15 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
-ESW_COMPONENT = "pmufw.elf"
+ESW_COMPONENT = "zynqmp_pmufw.elf"
+do_configure:prepend() {
+    (
+    cd ${S}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
 do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
index 9b3d6475..c4953ce7 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
@@ -10,6 +10,13 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/versal_psmfw/src/"
 ESW_COMPONENT = "versal_psmfw.elf"
+do_configure:prepend() {
+    (
+    cd ${S}
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${S}/${ESW_COMPONENT_SRC}
+    )
+}
 do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
index 88046966..0a5736d8 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -1,25 +1,12 @@
-Document Version: 20211209
+Document Version: 20230112
-The Yocto Project setup for the new workflow is as follows.  Be sure to read
+The Yocto Project setup for the System Device Tree workflow is as follows.
-everything below, as the steps will be updated in the future if the
+Be sure to read everything below, as the steps will be updated in the future
-setup script changes.
+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.
-* Configure you local.conf
-The following items should be in your conf/local.conf.  This ensures that
-the correct configurations are available, and the correct firmware version
-is selected for this workflow.
-# Instruct the system to use the decoupling firmware sources,
-# add the following to the conf/local.conf:
-PREFERRED_VERSION_fsbl-firmware = "experimental%"
-PREFERRED_VERSION_pmu-firmware = "experimental%"
-PREFERRED_VERSION_plm-firmware = "experimental%"
-PREFERRED_VERSION_psm-firmware = "experimental%"
 * Run the setup script
 The setup environment should be run in a new shell (not the build shell)
@@ -28,68 +15,88 @@ 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
+Source the SDK environment file
-. <build>/prestep/environment-setup-x86_64-petalinux-linux
+ $ . <build>/prestep/environment-setup-x86_64-petalinux-linux
-# Run the script from the same directory as this README
+Run the script from the same directory as this README
-<build>/prestep/dt-processor.sh -c <conf> -s <dtb>
+ $ <build>/prestep/dt-processor.sh -c <conf> -s <dtb> -l conf/local.conf
-# For example, zynqmp:
+Note: The -l option will automatically add the necessary parameters to the
-# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/zu-sdt/system-top.dts
+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
-# Follow the instructions returned by the script!
+printed to the screen and must be manually added to your conf/local.conf
-# Such as:
+For example, zynqmp:
-To enable this, add the following to your local.conf:
+ $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/zcu102-sdt/system-top.dts -l conf/local.conf
-# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+The following will be written to the end of the conf/local.conf file:
-BASE_TMPDIR = "${TOPDIR}"
-require conf/cortexa53-zynqmp-linux.conf
+  # Each multiconfig will define it's own TMPDIR, this is the new default based
-SYSTEM_DTFILE = "/proj/yocto/zu_sdt/system-top.dts"
+  # on BASE_TMPDIR for the Linux build
-BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexa53-zynqmp-freertos cortexr5-zynqmp-fsbl-baremetal cortexr5-zynqmp-baremetal cortexr5-zynqmp-freertos microblaze-pmu"
+  TMPDIR = "${BASE_TMPDIR}/tmp"
-FSBL_DEPENDS = ""
-FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+  # Use the newly generated MACHINE
-FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+  MACHINE = "xlnx-zynqmp-zcu102-rev1-0"
-R5FSBL_DEPENDS = ""
+  
-R5FSBL_MCDEPENDS = "mc::cortexr5-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+  # All of the TMPDIRs must be in a common parent directory. This is defined
-R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+  # as BASE_TMPDIR.
-PMU_DEPENDS = ""
+  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy"
+  BASE_TMPDIR ?= "${TOPDIR}"
-PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
+  
+  # The following is the full set of multiconfigs for this configuration
-#
+  # A large list can cause a slow parse.
-# OR
+  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
-# Versal:
+  #BBMULTICONFIG = " cortexa53-0-zynqmp-fsbl-baremetal microblaze-0-pmu"
-# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/vck190-sdt/system-top.dts
-#
-# Follow the instructions returned by the script!
+For example, versal:
-# Such as:
+ $ ./prestep/dt-processor.sh -c conf -s /proj/yocto/vmk180-sdt/system-top.dts -l conf/local.conf
-To enable this, add the following to your local.conf:
+The following will be written to the end of the conf/local.conf file:
-# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+  # Each multiconfig will define it's own TMPDIR, this is the new default based
-BASE_TMPDIR = "${TOPDIR}"
+  # on BASE_TMPDIR for the Linux build
-require conf/cortexa72-versal-linux.conf
+  TMPDIR = "${BASE_TMPDIR}/tmp"
-SYSTEM_DTFILE = "/proj/yocto/mhatle/DTB-FLOW/testing/vck190-sdt/system-top.dts"
+  
-BBMULTICONFIG += " cortexa72-versal-baremetal cortexa72-versal-freertos microblaze-pmc microblaze-psm cortexr5-versal-baremetal cortexr5-versal-freertos"
+  # Use the newly generated MACHINE
-PLM_DEPENDS = ""
+  MACHINE = "xlnx-versal-vmk180-rev1-1-x-ebm-01-reva"
-PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy"
+  
-PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
+  # All of the TMPDIRs must be in a common parent directory. This is defined
-PSM_DEPENDS = ""
+  # as BASE_TMPDIR.
-PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy"
+  # Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
+  BASE_TMPDIR ?= "${TOPDIR}"
-PDI_PATH = "__PATH TO PDI FILE HERE__"
+  
+  # The following is the full set of multiconfigs for this configuration
-# NOTE: On versal, you MUST specify the PDI file as directed by the instructions.
+  # A large list can cause a slow parse.
-# such as: PDI_PATH = "__PATH TO PDI FILE HERE__"
+  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"
-# Use the full path to the corresponding PDI file, such as:
+  # Alternatively trim the list to the minimum
-PDI_PATH = "/proj/yocto/vck190-sdt/base-design.pdi"
+  #BBMULTICONFIG = " microblaze-0-pmc microblaze-0-psm"
-# _EXIT THE NEW SHELL_  return the build environment
+You can now EXIT THE NEW SHELL return the build environment for the remaining steps.
-### In the original build shell
-# Build your Linux sytem:
+* Bitbake Performance Note
-bitbake petalinux-image-minimal
+Each BBMULTICONFIG value requires all of the recipes to be parsed for that
-# The output will be in tmp/deploy/images/...
+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
index 22345321..939fabe4 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -34,12 +34,14 @@ usage() {
  cat <<EOF
 $0
    -c <config_dir>         Location of the build conf directory
-    -s <system_dtb>         Path to system DTB
+    -s <system_dts>         Path to system dts
    [-d <domain_file>]      Path to domain file (.yml/.dts)
-    [-o <overlay_dtb>]      Generate overlay dts
+    [-o <overlay_dts>]      Generate overlay dts
    [-e <external_fpga>]    Apply a partial overlay
-    [-m <machine>]          zynqmp or versal
+    [-m <machine_conf>]     The name of the machine .conf to generate
-    [-p <psu_init_path>]    Path to psu_init files, defaults to system_dtb path
+    [-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)
+    [-p <psu_init_path>]    Path to psu_init files, defaults to system_dts path
    [-i <pdu_path>]         Path to the pdi file
    [-l <config_file>]      write local.conf changes to this file
    [-P <petalinux_schema>] Path to petalinux schema file
@@ -52,14 +54,16 @@ parse_args() {
  [ $# -eq 0 ] && usage
  [ $1 = "--help" ] && usage
-  while getopts ":c:s:d:o:e:m:l:hP:p:i:" opt; do
+  while getopts ":c:s:d:o:e:m:l:hP:p:i:t:v:" opt; do
    case ${opt} in
      c) config_dir=$OPTARG ;;
-      s) system_dtb=$OPTARG ;;
+      s) system_dts=$OPTARG ;;
-      o) overlay_dtb=$OPTARG ;;
+      o) overlay_dts=$OPTARG ;;
      d) domain_file=$OPTARG ;;
      e) external_fpga=$OPTARG ;;
-      m) machine=$OPTARG ;;
+      m) mach_conf=$OPTARG ; mach_conf=${mach_conf%%.conf} ;;
+      t) machine=$OPTARG ;;
+      v) soc_variant=$OPTARG ;;
      p) psu_init_path=$OPTARG ;;
      i) pdi_path=$OPTARG ;;
      l) localconf=$OPTARG ;;
@@ -71,17 +75,17 @@ parse_args() {
  done
  [ -z "${config_dir}" ] && error "You must specify the path to the build conf directory with -c"
-  [ -z "${system_dtb}" ] && error "You must specify the path to the system device tree with -s"
+  [ -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_dtb}" ] || error "Unable to find: ${system_dtb}"
+  [ -f "${system_dts}" ] || error "Unable to find: ${system_dts}"
-  system_dtb=$(realpath ${system_dtb})
+  system_dts=$(realpath ${system_dts})
  if [ -z "$psu_init_path" ]; then
-    psu_init_path=$(dirname ${system_dtb})
+    psu_init_path=$(dirname ${system_dts})
  else
    psu_init_path=$(realpath ${psu_init_path})
  fi
  if [ -z "$pdi_path" ]; then
-    pdi_path=$(dirname ${system_dtb})
+    pdi_path=$(dirname ${system_dts})
  else
    pdi_path=$(realpath ${pdi_path})
  fi
@@ -93,51 +97,115 @@ parse_args() {
 detect_machine() {
  if [ -z "${machine}" ]; then
-    # Identify the system type first using PSM/PMC/PMU
+    if [ -n "${deviceid}" ]; then
-    while read -r cpu domain os_hint; do
+      case ${deviceid} in
-      case ${cpu} in
+         # ZynqMP variants
-        pmu-microblaze)
+         xczu*cg)
-          machine="zynqmp" ;;
+           machine="zynqmp"
-        pmc-microblaze | psm-microblaze)
+           soc_variant="cg" ;;
-          machine="versal" ;;
+         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)
+           incmachine="k26-smk.conf"
+           machine="zynqmp"
+           soc_variant="ev" ;;
+         xck24)
+           incmachine="k24-smk.conf"
+           machine="zynqmp"
+           soc_variant="eg" ;;
      esac
-    done <${cpulist}
+    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 -m to specify the 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
-    dtb_file="cortexa53-${machine}-linux.dtb"
    dts_file="cortexa53-${machine}-linux.dts"
-    system_conf=conf/cortexa53-${machine}-linux.conf
+    system_conf=${dts_file}
-    conf_file=cortexa53-${machine}-linux.conf
+    conf_file=""
  else
-    dtb_file="cortexa53-${machine}-$1-linux.dtb"
+    mc_name=cortexa53-${machine}-$1-linux
-    dts_file="cortexa53-${machine}-$1-linux.dts"
+    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} cortexa53-${machine}-linux"
+    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/cortexa53-${machine}-$1-linux.conf
+    conf_file=multiconfig/${mc_name}.conf
  fi
-  # Check if it is overlay dts otherwise just create linux dtb
+  # Check if it is overlay dts otherwise just create linux dts
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    if [ "${overlay_dtb}" = "true" ]; then
+    if [ "${overlay_dts}" = "true" ]; then
      if [ "${external_fpga}" = "true" ]; then
-        LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dtb}" -- xlnx_overlay_dt ${machine} full \
+        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_dtb}" -- xlnx_overlay_dt ${machine} partial \
+        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"
@@ -146,42 +214,27 @@ cortex_a53_linux() {
        -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_dtb}" "${dtb_file}" \
+        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-      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_dtb}" "${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_dtb}" "${dtb_file}" \
+        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-      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_dtb}" "${dts_file}" \
        || error "lopper failed"
    fi
-    rm -f pl.dtsi lop-a53-imux.dts.dtb lop-domain-linux-a53.dts.dtb
+    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 = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-MACHINE = "${machine}-generic"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-# We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE:${machine}-generic = ""
-# We need u-boot to use the one we passed in
-DEVICE_TREE_NAME:pn-u-boot-xlnx-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
-# Update bootbin to use proper device tree
-BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
-# Remap boot files to ensure the right device tree is listed first
-IMAGE_BOOT_FILES = "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))} \${@get_default_image_boot_files(d)}"
 EOF
 }
@@ -191,7 +244,7 @@ cortex_a53_baremetal() {
    [ ${a53_fsbl_done} = 1 ] && return
    info "cortex-a53 FSBL baremetal configuration"
  else
-    info "cortex-a53 for baremetal [ $1 ]"
+    info "cortex-a53 baremetal configuration for core $2 [ $1 ]"
  fi
  suffix=""; lto="-nolto"
@@ -199,44 +252,47 @@ cortex_a53_baremetal() {
    suffix="-$1"; lto=""
  fi
-  dtb_file="cortexa53-${machine}${suffix}-baremetal.dtb"
+  mc_name="cortexa53-$2-${machine}${suffix}-baremetal"
-  multiconf="${multiconf} cortexa53-${machine}${suffix}-baremetal"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexa53-${machine}${suffix}-baremetal.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexa53-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexa53-${machine}${suffix}-distro.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::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
+    fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    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 dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-a53-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  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
@@ -253,80 +309,66 @@ EOF
    cat /dev/null >"${conf_file}"
  fi
  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexa53-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa53"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "${yocto_distro}"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
 cortex_a53_freertos() {
-  info "cortex-a53 for FreeRTOS [ $1 ]"
+  info "cortex-a53 FreeRTOS configuration for core $2 [ $1 ]"
  suffix=""
  [ "$1" != "None" ] && suffix="-$1"
-  dtb_file="cortexa53-${machine}${suffix}-freertos.dtb"
+  mc_name="cortexa53-$2-${machine}${suffix}-freertos"
-  multiconf="${multiconf} cortexa53-${machine}${suffix}-freertos"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexa53-${machine}${suffix}-freertos.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexa53-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexa53-${machine}${suffix}-distro.conf"
+  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
+  features="machine/include/${mach_conf}/${mc_name}-features.conf"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-a53-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa53-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexa53-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa53"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-freertos"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
@@ -336,36 +378,35 @@ cortex_a72_linux() {
  # 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
-    warn "Warning: Unable to find a pdi file in ${pdi_path}"
+    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
-    dtb_file="cortexa72-${machine}-linux.dtb"
    dts_file="cortexa72-${machine}-linux.dts"
-    system_conf=conf/cortexa72-${machine}-linux.conf
+    system_conf=${dts_file}
-    conf_file=cortexa72-${machine}-linux.conf
+    conf_file=""
  else
-    dtb_file="cortexa72-${machine}-$1-linux.dtb"
+    mc_name="cortexa72-${machine}-$1-linux"
-    dts_file="cortexa72-${machine}-$1-linux.dts"
+    dts_file="${mc_name}.dts"
-    multiconf="${multiconf} cortexa72-${machine}-linux"
+    multiconf="${multiconf} ${mc_name}"
-    conf_file=multiconfig/cortexa72-${machine}-$1-linux.conf
+    conf_file=multiconfig/${mc_name}.conf
  fi
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    # Check if it is overlay dts otherwise just create linux dtb
+    # Check if it is overlay dts otherwise just create linux dts
-    if [ "${overlay_dtb}" = "true" ]; then
+    if [ "${overlay_dts}" = "true" ]; then
      # As there is no partial support on Versal, As per fpga manager implementatin 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_dtb}" -- xlnx_overlay_dt \
+        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_dtb}" -- xlnx_overlay_dt \
+        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"
@@ -374,156 +415,130 @@ cortex_a72_linux() {
        -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_dtb}" "${dtb_file}" \
+        "${system_dts}" "${dts_file}" \
-        || error "lopper failed"
-      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_dtb}" "${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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
-      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_dtb}" "${dts_file}" || error "lopper failed"
    fi
-    rm -f pl.dtsi lop-a72-imux.dts.dtb lop-domain-a72.dts.dtb
+    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 = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-MACHINE = "${machine}-generic"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
-# We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE:${machine}-generic = ""
-# We need u-boot to use the one we passed in
-DEVICE_TREE_NAME:pn-u-boot-xlnx-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
-# Update bootbin to use proper device tree
-BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
-# Remap boot files to ensure the right device tree is listed first
-IMAGE_BOOT_FILES = "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))} \${@get_default_image_boot_files(d)}"
 EOF
 }
 cortex_a72_baremetal() {
-  info "cortex-a72 for baremetal [ $1 ]"
+  info "cortex-a72 baremetal configuration for core $2 [ $1 ]"
  suffix=""
  [ "$1" != "None" ] && suffix="-$1"
-  dtb_file="cortexa72-${machine}${suffix}-baremetal.dtb"
+  mc_name="cortexa72-$2-${machine}${suffix}-baremetal"
-  multiconf="${multiconf} cortexa72-${machine}${suffix}-baremetal"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexa72-${machine}${suffix}-baremetal.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexa72-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexa72-${machine}${suffix}-distro.conf"
+  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
+  features="machine/include/${mach_conf}/${mc_name}-features.conf"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-a72-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexa72-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa72"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-standalone-nolto"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
 cortex_a72_freertos() {
-  info "cortex-a72 for FreeRTOS [ $1 ]"
+  info "cortex-a72 FreeRTOS configuration for core $2 [ $1 ]"
  suffix=""
  [ "$1" != "None" ] && suffix="-$1"
-  dtb_file="cortexa72-${machine}${suffix}-freertos.dtb"
+  mc_name="cortexa72-$2-${machine}${suffix}-freertos"
-  multiconf="${multiconf} cortexa72-${machine}${suffix}-freertos"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexa72-${machine}${suffix}-freertos.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexa72-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexa72-${machine}${suffix}-distro.conf"
+  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
+  features="machine/include/${mach_conf}/${mc_name}-features.conf"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-a72-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexa72-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexa72-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa72"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-freertos"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
@@ -533,7 +548,7 @@ cortex_r5_baremetal() {
    [ ${r5_fsbl_done} = 1 ] && return
    info "cortex-r5 FSBL baremetal configuration"
  else
-    info "cortex-r5 for baremetal [ $1 ]"
+    info "cortex-r5 baremetal configuration for core $2 [ $1 ]"
  fi
  suffix=""; lto="-nolto"
@@ -541,44 +556,46 @@ cortex_r5_baremetal() {
    suffix="-$1"; lto=""
  fi
-  dtb_file="cortexr5-${machine}${suffix}-baremetal.dtb"
+  mc_name="cortexr5-$2-${machine}${suffix}-baremetal"
-  multiconf="${multiconf} cortexr5-${machine}${suffix}-baremetal"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexr5-${machine}${suffix}-baremetal.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexr5-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexr5-${machine}${suffix}-distro.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::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
+    r5fsbl_mcdepends="mc::${mc_name}:fsbl-firmware:do_deploy"
-    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
    r5_fsbl_done=1
  fi
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-r5-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  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
@@ -595,80 +612,66 @@ EOF
    cat /dev/null >"${conf_file}"
  fi
  cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexr5-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexr5"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "$yocto_distro"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
 cortex_r5_freertos() {
-  info "cortex-r5 for FreeRTOS [ $1 ]"
+  info "cortex-r5 FreeRTOS configuration for core $2 [ $1 ]"
  suffix=""
  [ "$1" != "None" ] && suffix="-$1"
-  dtb_file="cortexr5-${machine}${suffix}-freertos.dtb"
+  mc_name="cortexr5-$2-${machine}${suffix}-freertos"
-  multiconf="${multiconf} cortexr5-${machine}${suffix}-freertos"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/cortexr5-${machine}${suffix}-freertos.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/cortexr5-${machine}${suffix}-libxil.conf"
+  conf_file="multiconfig/${mc_name}.conf"
-  distro="multiconfig/includes/cortexr5-${machine}${suffix}-distro.conf"
+  libxil="machine/include/${mach_conf}/${mc_name}-libxil.conf"
+  features="machine/include/${mach_conf}/${mc_name}-features.conf"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts 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_dtb}" "${dtb_file}" \
+        -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_dtb}" "${dtb_file}" || error "lopper failed"
+        "${system_dts}" "${dts_file}" || error "lopper failed"
    fi
    rm -f lop-r5-imux.dts.dtb
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $3 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $3 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "cortexr5-${machine}"
+ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexr5"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-freertos"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
@@ -679,12 +682,15 @@ process_microblaze() {
  info "Generating microblaze processor tunes"
+  mkdir -p machine/include/${mach_conf}
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    ${lopper} -f --enhanced -i "${lops_dir}/lop-microblaze-yocto.dts" "${system_dtb}" \
+    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
-  ) >microblaze.conf
+  ) >machine/include/${mach_conf}/microblaze.inc
+  echo "require conf/machine/include/xilinx-microblaze.inc" >> machine/include/${mach_conf}/microblaze.inc
  microblaze_done=1
 }
@@ -695,55 +701,48 @@ pmu-microblaze() {
  process_microblaze
-  dtb_file="microblaze-pmu.dtb"
+  mc_name="microblaze-0-pmu"
-  multiconf="${multiconf} microblaze-pmu"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/microblaze-pmu.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/microblaze-pmu-libxil.conf"
+  multiconf_min="${multiconf_min} ${mc_name}"
-  distro="multiconfig/includes/microblaze-pmu-distro.conf"
+  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::${dtb_file%%.dtb}:pmu-firmware:do_deploy"
+  pmu_mcdepends="mc::${mc_name}:pmu-firmware:do_deploy"
-  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dtb}" "${dtb_file}" || error "lopper failed"
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-pmu "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "microblaze-pmu"
+ESW_MACHINE = "$1"
-require conf/microblaze.conf
+DEFAULTTUNE = "microblaze-pmu"
-DEFAULTTUNE = "microblaze"
-TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmu-microblaze}"
 TARGET_CFLAGS += "-DPSU_PMU=1U"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-standalone"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
@@ -753,55 +752,48 @@ pmc-microblaze() {
  process_microblaze
-  dtb_file="microblaze-pmc.dtb"
+  mc_name="microblaze-0-pmc"
-  multiconf="${multiconf} microblaze-pmc"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/microblaze-pmc.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/microblaze-pmc-libxil.conf"
+  multiconf_min="${multiconf_min} ${mc_name}"
-  distro="multiconfig/includes/microblaze-pmc-distro.conf"
+  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::${dtb_file%%.dtb}:plm-firmware:do_deploy"
+  plm_mcdepends="mc::${mc_name}:plm-firmware:do_deploy"
-  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dtb}" "${dtb_file}" || error "lopper failed"
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-plm "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "microblaze-plm"
+ESW_MACHINE = "$1"
-require conf/microblaze.conf
+DEFAULTTUNE = "microblaze-pmc"
-DEFAULTTUNE = "microblaze"
-TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmc-microblaze}"
 TARGET_CFLAGS += "-DVERSAL_PLM=1"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-standalone"
-LIBXIL_CONFIG = "conf/${libxil}"
-require conf/${distro}
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
 }
@@ -811,63 +803,194 @@ psm-microblaze() {
  process_microblaze
-  dtb_file="microblaze-psm.dtb"
+  mc_name="microblaze-0-psm"
-  multiconf="${multiconf} microblaze-psm"
+  dts_file="${mc_name}.dts"
-  conf_file="multiconfig/microblaze-psm.conf"
+  multiconf="${multiconf} ${mc_name}"
-  libxil="multiconfig/includes/microblaze-psm-libxil.conf"
+  multiconf_min="${multiconf_min} ${mc_name}"
-  distro="multiconfig/includes/microblaze-psm-distro.conf"
+  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::${dtb_file%%.dtb}:psm-firmware:do_deploy"
+  psm_mcdepends="mc::${mc_name}:psm-firmware:do_deploy"
-  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${mc_name}/deploy/images/\${MACHINE}"
  # Build device tree
  (
-    cd dtb || error "Unable to cd to dtb dir"
+    cd dts || error "Unable to cd to dts dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dtb}" "${dtb_file}" || error "lopper failed"
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
  )
  # Build baremetal multiconfig
  if [ -n "${domain_file}" ]; then
-    ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' -i "${domain_file}" "${system_dts}" \
-      -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" || error "lopper failed"
+      -- baremetaldrvlist_xlnx $1 "${embeddedsw}" || error "lopper failed"
  else
-    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx microblaze-psm "${embeddedsw}" \
+    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- baremetaldrvlist_xlnx $1 "${embeddedsw}" \
      || error "lopper failed"
  fi
  mv libxil.conf "${libxil}"
-  mv distro.conf "${distro}"
+  mv distro.conf "${features}"
+  sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
  cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_file}"
-CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
-ESW_MACHINE = "microblaze-psm"
+ESW_MACHINE = "$1"
-require conf/microblaze.conf
+DEFAULTTUNE = "microblaze-psm"
-DEFAULTTUNE = "microblaze"
-TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-psm-microblaze}"
 TARGET_CFLAGS += "-DVERSAL_psm=1"
-TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 DISTRO = "xilinx-standalone"
+EOF
+}
-LIBXIL_CONFIG = "conf/${libxil}"
+generate_machine() {
-require conf/${distro}
+  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
-SKIP_META_VIRT_SANITY_CHECK = "1"
-SKIP_META_SECURITY_SANITY_CHECK = "1"
-SKIP_META_TPM_SANITY_CHECK = "1"
 EOF
-}
-parse_cpus() {
+  if [ "${machine}" == "zynqmp" ]; then
-  info "Generating configuration..."
+    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 ?= "\${TOPDIR}/conf/dts/${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.1_sdt_experimental%"
+PREFERRED_VERSION_pmu-firmware = "2023.1_sdt_experimental%"
+PREFERRED_VERSION_plm-firmware = "2023.1_sdt_experimental%"
+PREFERRED_VERSION_psm-firmware = "2023.1_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'))}"
-  while read -r cpu domain os_hint; do
+#### 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 ;;
@@ -877,19 +1000,28 @@ parse_cpus() {
      arm,cortex-a53)
        # We need a base cortex_a53_baremetal for the FSBL
-        cortex_a53_baremetal fsbl
+        if [ "${core}" == 0 ]; then
+          cortex_a53_baremetal fsbl ${core} ${cpu_name}
+        fi
        if [ "${os_hint}" == "None" ]; then
-          cortex_a53_linux "${domain}"
+          if [ "${gen_linux_dts}" == "None" ]; then
-          cortex_a53_baremetal "${domain}"
+            cortex_a53_linux "${domain}"
-          cortex_a53_freertos "${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*)
-              cortex_a53_linux "${domain}" ;;
+              if [ "${gen_linux_dts}" == "None" ]; then
+                cortex_a53_linux "${domain}"
+                gen_linux_dts="True"
+              fi
+              ;;
            baremetal*)
-              cortex_a53_baremetal "${domain}" ;;
+              cortex_a53_baremetal "${domain}" ${core} ${cpu_name};;
            freertos*)
-              cortex_a53_freertos "${domain}" ;;
+              cortex_a53_freertos "${domain}" ${core} ${cpu_name};;
            *)
              warn "cortex-a53 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
              cortex_a53_baremetal "${domain}"
@@ -899,36 +1031,42 @@ parse_cpus() {
      arm,cortex-a72)
        if [ "${os_hint}" == "None" ]; then
-          cortex_a72_linux "${domain}"
+          if [ "${gen_linux_dts}" == "None" ]; then
-          cortex_a72_baremetal "${domain}"
+            cortex_a72_linux "${domain}"
-          cortex_a72_freertos "${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*)
-              cortex_a72_linux "${domain}" ;;
+              if [ "${gen_linux_dts}" == "None" ]; then
+                cortex_a72_linux "${domain}"
+                gen_linux_dts="True"
+              fi
+              ;;
            baremetal*)
-              cortex_a72_baremetal "${domain}" ;;
+              cortex_a72_baremetal "${domain}" ${core} ${cpu_name};;
            freertos*)
-              cortex_a72_freertos "${domain}" ;;
+              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
+          [ "${machine}" = "zynqmp" ] && cortex_r5_baremetal fsbl ${core} ${cpu_name}
-          cortex_r5_baremetal "${domain}"
+          cortex_r5_baremetal "${domain}" ${core} ${cpu_name}
-          cortex_r5_freertos "${domain}"
+          cortex_r5_freertos "${domain}" ${core} ${cpu_name}
        else
          case "${os_hint}" in
            baremetal*)
-              cortex_r5_baremetal "${domain}" ;;
+              cortex_r5_baremetal "${domain}" ${core} ${cpu_name};;
            freertos*)
-              cortex_r5_freertos "${domain}" ;;
+              cortex_r5_freertos "${domain}" ${core} ${cpu_name};;
            *)
              warn "cortex-r5 for unknown OS (${os_hint}), parsing baremetal. ${domain}"
              cortex_r5_baremetal "${domain}"
@@ -949,14 +1087,13 @@ parse_cpus() {
        ;;
      pmu-microblaze)
-        pmu-microblaze ;;
+        pmu-microblaze ${cpu_name};;
      pmc-microblaze)
-        pmc-microblaze ;;
+        pmc-microblaze ${cpu_name};;
      psm-microblaze)
-        psm-microblaze ;;
+        psm-microblaze ${cpu_name};;
      *)
        warn "Unknown CPU ${cpu}"
@@ -965,45 +1102,45 @@ parse_cpus() {
 }
 gen_local_conf() {
-  echo "# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere" >> $1
+  cat << EOF >> $1
-  echo "BASE_TMPDIR ?= \"\${TOPDIR}\"" >> $1
-  [ -n "${system_conf}" ] && echo "require ${system_conf}" >> $1
+# Avoid errors in some baremetal configs as these layers may be present
-  echo "SYSTEM_DTFILE = \"${system_dtb}\"" >> $1
+# but are not used.  Note the following lines are optional and can be
-  echo "BBMULTICONFIG += \"${multiconf}\"" >> $1
+# safetly disabled.
-  if [ -n "${fsbl_mcdepends}" ]; then
+SKIP_META_VIRT_SANITY_CHECK = "1"
-    echo "FSBL_DEPENDS = \"\"" >> $1
+SKIP_META_SECURITY_SANITY_CHECK = "1"
-    echo "FSBL_MCDEPENDS = \"${fsbl_mcdepends}\"" >> $1
+SKIP_META_TPM_SANITY_CHECK = "1"
-    echo "FSBL_DEPLOY_DIR = \"${fsbl_deploy_dir}\"" >> $1
-  fi
+# Each multiconfig will define it's own TMPDIR, this is the new default based
-  if [ -n "${r5fsbl_mcdepends}" ]; then
+# on BASE_TMPDIR for the Linux build
-    echo "R5FSBL_DEPENDS = \"\"" >> $1
+TMPDIR = "\${BASE_TMPDIR}/tmp"
-    echo "R5FSBL_MCDEPENDS = \"${r5fsbl_mcdepends}\"" >> $1
-    echo "R5FSBL_DEPLOY_DIR = \"${r5fsbl_deploy_dir}\"" >> $1
+# Use the newly generated MACHINE
-  fi
+MACHINE = "${mach_conf}"
-  if [ -n "${pmu_mcdepends}" ]; then
-    echo "PMU_DEPENDS = \"\"" >> $1
+# All of the TMPDIRs must be in a common parent directory. This is defined
-    echo "PMU_MCDEPENDS = \"${pmu_mcdepends}\"" >> $1
+# as BASE_TMPDIR.
-    echo "PMU_FIRMWARE_DEPLOY_DIR = \"${pmu_firmware_deploy_dir}\"" >> $1
+# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere, such as /tmp
-  fi
+BASE_TMPDIR ?= "\${TOPDIR}"
-  if [ -n "${plm_mcdepends}" ]; then
-    echo "PLM_DEPENDS = \"\"" >> $1
+# The following is the full set of multiconfigs for this configuration
-    echo "PLM_MCDEPENDS = \"${plm_mcdepends}\"" >> $1
+# A large list can cause a slow parse.
-    echo "PLM_DEPLOY_DIR = \"${plm_deploy_dir}\"" >> $1
+BBMULTICONFIG ?= "${multiconf}"
-  fi
+# Alternatively trim the list to the minimum
-  if [ -n "${psm_mcdepends}" ]; then
+#BBMULTICONFIG = "${multiconf_min}"
-    echo "PSM_DEPENDS = \"\"" >> $1
+EOF
-    echo "PSM_MCDEPENDS = \"${psm_mcdepends}\"" >> $1
-    echo "PSM_FIRMWARE_DEPLOY_DIR = \"${psm_firmware_deploy_dir}\"" >> $1
-  fi
-  [ "${machine}" = "versal" ] && echo "PDI_PATH = \"${full_pdi_path}\"" >> $1
-  echo
 }
 gen_petalinux_conf() {
  cd "${config_dir}" || exit
  (
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} "${system_dtb}" -- petalinuxconfig_xlnx ${petalinux_schema} \
+    if [ "$machine" == "zynqmp" ]; then
-      || error "lopper failed"
+      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 "$@"
@@ -1020,20 +1157,47 @@ multiconf=""
 cpulist=$(mktemp)
 priordir=$(pwd)
-# Generate CPU list
 cd "${config_dir}" || exit
-mkdir -p dtb multiconfig/includes
+mkdir -p dts multiconfig machine/include
+# Get mach_conf name and model name
 (
-  cd dtb || error "Unable to cd to dtb dir"
+  cd dts || error "Unable to cd to dts dir"
-  ${lopper} -f --enhanced -i "${lops_dir}/lop-xilinx-id-cpus.dts" "${system_dtb}" \
+  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
+# 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}
+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
@@ -1058,4 +1222,4 @@ if [ -n "${petalinux_schema}" ]; then
 fi
 # Cleanup our temp file
-rm ${cpulist}
+rm -rf ${cpulist} ${config_dir}/CMakeLists.txt ${config_dir}/DRVLISTConfig.cmake
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb
index 2ac8954b..7edd2d9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "avbuf"
+REQUIRED_MACHINE_FEATURES = "avbuf"
 inherit esw
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb
index 081609dd..1846b291 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "axicdma"
+REQUIRED_MACHINE_FEATURES = "axicdma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axicdma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb
index 3c7e8b72..47111dc5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axicdma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axicdma"
+REQUIRED_MACHINE_FEATURES = "axicdma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb
index db8658a1..68a26f45 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "axidma"
+REQUIRED_MACHINE_FEATURES = "axidma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axidma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb
index 8b24a67e..c385d13f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axidma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axidma"
+REQUIRED_MACHINE_FEATURES = "axidma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb
index 8dee5feb..04c2c151 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "axiethernet"
+REQUIRED_MACHINE_FEATURES = "axiethernet"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axiethernet/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb
index b230e6ad..0b635859 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axiethernet_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axiethernet"
+REQUIRED_MACHINE_FEATURES = "axiethernet"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb
index 4c949e99..4aa716e7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "axipmon"
+REQUIRED_MACHINE_FEATURES = "axipmon"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axipmon/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb
index 3fa70322..ff2eae91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axipmon_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axipmon"
+REQUIRED_MACHINE_FEATURES = "axipmon"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb
index 2f69db45..b34dedb0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axis-switch_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axis-switch"
+REQUIRED_MACHINE_FEATURES = "axis-switch"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb
index 6742356c..2866c02b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "axivdma"
+REQUIRED_MACHINE_FEATURES = "axivdma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axivdma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb
index 5f22d212..15268629 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/axivdma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "axivdma"
+REQUIRED_MACHINE_FEATURES = "axivdma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb
index 6e2c4918..a3145467 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "bram"
+REQUIRED_MACHINE_FEATURES = "bram"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/bram/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb
index 400da93e..3c81c619 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "bram"
+REQUIRED_MACHINE_FEATURES = "bram"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb
index 9e6417ce..115852fa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "can"
+REQUIRED_MACHINE_FEATURES = "can"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/can/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb
index 07024082..eb7fc473 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "can"
+REQUIRED_MACHINE_FEATURES = "can"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb
index c8395f4e..84276569 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "canfd"
+REQUIRED_MACHINE_FEATURES = "canfd"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/canfd/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb
index 719126e5..5f2e6ea8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "canfd"
+REQUIRED_MACHINE_FEATURES = "canfd"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb
index 17ac3d0c..574dc563 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "canps"
+REQUIRED_MACHINE_FEATURES = "canps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/canps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb
index ae88f744..c9f61cd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "canps"
+REQUIRED_MACHINE_FEATURES = "canps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb
index bb4a540f..6ffdf85d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cframe_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "cframe"
+REQUIRED_MACHINE_FEATURES = "cframe"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb
index 6b15f41b..3cb675bc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/cfupmc_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "cfupmc"
+REQUIRED_MACHINE_FEATURES = "cfupmc"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb
index a1ce7ed0..ae0453a1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clk-wiz_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "clk-wiz"
+REQUIRED_MACHINE_FEATURES = "clk-wiz"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
index 67fb695e..f9c5bce6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
@@ -2,7 +2,7 @@ inherit esw deploy features_check
 ESW_COMPONENT_SRC = "XilinxProcessorIPLib/drivers/clockps/examples/"
-REQUIRED_DISTRO_FEATURES = "clockps"
+REQUIRED_MACHINE_FEATURES = "clockps"
 DEPENDS += "libxil xiltimer resetps"
@@ -12,7 +12,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb
index 99ec8e85..4bddb2c0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "clockps"
+REQUIRED_MACHINE_FEATURES = "clockps"
 inherit esw
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
index d01a8cac..541ff225 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
@@ -1,14 +1,14 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "common"
+REQUIRED_MACHINE_FEATURES = "common"
 inherit esw python3native
 DEPENDS += "xilstandalone "
-PACKAGECONFIG ?= "${@bb.utils.contains("DISTRO_FEATURES", "clockps", "clockps", "", d)} \
+PACKAGECONFIG ?= "${@bb.utils.contains("MACHINE_FEATURES", "clockps", "clockps", "", d)} \
-                  ${@bb.utils.contains("DISTRO_FEATURES", "scugic", "scugic", "", d)} \
+                  ${@bb.utils.contains("MACHINE_FEATURES", "scugic", "scugic", "", d)} \
-                  ${@bb.utils.contains("DISTRO_FEATURES", "intc", "intc", "", d)}"
+                  ${@bb.utils.contains("MACHINE_FEATURES", "intc", "intc", "", d)}"
 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,,"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb
index f1dce225..9110b51e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/coresightps-dcc_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "coresightps-dcc"
+REQUIRED_MACHINE_FEATURES = "coresightps-dcc"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb
index 3f5c2138..5706967a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "csudma"
+REQUIRED_MACHINE_FEATURES = "csudma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/csudma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb
index 002f6d15..8283ce8d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/csudma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "csudma"
+REQUIRED_MACHINE_FEATURES = "csudma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb
index 91f2679d..4728b6c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ddrcpsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "ddrcpsu"
+REQUIRED_MACHINE_FEATURES = "ddrcpsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb
index 2b0cd72f..dd70e09d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "devcfg"
+REQUIRED_MACHINE_FEATURES = "devcfg"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/devcfg/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb
index 69d01ffa..4b794d22 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/devcfg_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "devcfg"
+REQUIRED_MACHINE_FEATURES = "devcfg"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb
index d98ba493..974dd48b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "dfxasm"
+REQUIRED_MACHINE_FEATURES = "dfxasm"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dfxasm/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb
index 755545d2..81f2157b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dfxasm_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "dfxasm"
+REQUIRED_MACHINE_FEATURES = "dfxasm"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb
index 77d4ac0c..40d08e4b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dmaps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "dmaps"
+REQUIRED_MACHINE_FEATURES = "dmaps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dmaps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb
index 82005fe9..3adb88a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "dpdma"
+REQUIRED_MACHINE_FEATURES = "dpdma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb
index 478af8a3..87cca884 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "dppsu"
+REQUIRED_MACHINE_FEATURES = "dppsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb
index 82a66d70..6ed717fb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "emaclite"
+REQUIRED_MACHINE_FEATURES = "emaclite"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emaclite/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb
index 2784110a..9ceb477f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emaclite_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "emaclite"
+REQUIRED_MACHINE_FEATURES = "emaclite"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb
index 93c2ff59..2c57eafe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "emacps"
+REQUIRED_MACHINE_FEATURES = "emacps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emacps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb
index 08bb3202..8ed85984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/emacps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "emacps"
+REQUIRED_MACHINE_FEATURES = "emacps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb
index 1446c92c..3f79cfec 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "gpio"
+REQUIRED_MACHINE_FEATURES = "gpio"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/gpio/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb
index 5bd6c7f0..83a746b7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "gpio"
+REQUIRED_MACHINE_FEATURES = "gpio"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb
index e7050fc4..cc2e1703 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "gpiops"
+REQUIRED_MACHINE_FEATURES = "gpiops"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/gpiops/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb
index 55fca761..4bd63d1e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/gpiops_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "gpiops"
+REQUIRED_MACHINE_FEATURES = "gpiops"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb
index 55627498..b781b82c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
  
-REQUIRED_DISTRO_FEATURES = "iic"
+REQUIRED_MACHINE_FEATURES = "iic"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/iic/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb
index 8474a61b..7011f90b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
  
-REQUIRED_DISTRO_FEATURES = "iic"
+REQUIRED_MACHINE_FEATURES = "iic"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb
index fec7256b..e9df1cbd 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "iicps"
+REQUIRED_MACHINE_FEATURES = "iicps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/iicps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb
index d68d7d88..e96dc2ac 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "iicps"
+REQUIRED_MACHINE_FEATURES = "iicps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb
index 2e86d35c..0b4b95a8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "intc"
+REQUIRED_MACHINE_FEATURES = "intc"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/intc/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb
index 05a44342..331c2e32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "intc"
+REQUIRED_MACHINE_FEATURES = "intc"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb
index c2ea342d..1f625521 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/iomodule_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "iomodule"
+REQUIRED_MACHINE_FEATURES = "iomodule"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb
index e007b74e..0b31601d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "ipipsu"
+REQUIRED_MACHINE_FEATURES = "ipipsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ipipsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb
index b7369c7a..3e2ccc0b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ipipsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "ipipsu"
+REQUIRED_MACHINE_FEATURES = "ipipsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb
index da02cbd2..6b1c211a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "llfifo"
+REQUIRED_MACHINE_FEATURES = "llfifo"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/llfifo/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb
index 4241f80a..1fb76b18 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/llfifo_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "llfifo"
+REQUIRED_MACHINE_FEATURES = "llfifo"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb
index 3adea549..3c4870b4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "mbox"
+REQUIRED_MACHINE_FEATURES = "mbox"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mbox/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb
index b7a3f54a..5c1b8393 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "mbox"
+REQUIRED_MACHINE_FEATURES = "mbox"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb
index 54622350..64979470 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "mcdma"
+REQUIRED_MACHINE_FEATURES = "mcdma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mcdma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb
index d697f768..f13a7e54 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "mcdma"
+REQUIRED_MACHINE_FEATURES = "mcdma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb
index ac637d2c..fc0527da 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "mutex"
+REQUIRED_MACHINE_FEATURES = "mutex"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mutex/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb
index b4702e03..98abc948 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "mutex"
+REQUIRED_MACHINE_FEATURES = "mutex"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb
index 0502471e..8b7a88b5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "nandpsu"
+REQUIRED_MACHINE_FEATURES = "nandpsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/nandpsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb
index 72e6160a..6d2a71c5 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/nandpsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "nandpsu"
+REQUIRED_MACHINE_FEATURES = "nandpsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb
index c9d68260..0ded4fd2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "ospipsv"
+REQUIRED_MACHINE_FEATURES = "ospipsv"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ospipsv/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
index 19cfe8ed..f0548efc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "ospipsv"
+REQUIRED_MACHINE_FEATURES = "ospipsv"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb
index a980b4b5..23895fba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "pciepsu"
+REQUIRED_MACHINE_FEATURES = "pciepsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/pciepsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb
index ce6cb3a0..ccedb1df 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/pciepsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "pciepsu"
+REQUIRED_MACHINE_FEATURES = "pciepsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb
index 7a77274d..674b879a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "qspips"
+REQUIRED_MACHINE_FEATURES = "qspips"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/qspips/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb
index 67c9e935..fa28d901 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspips_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "qspips"
+REQUIRED_MACHINE_FEATURES = "qspips"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb
index a533c50c..21231450 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "qspipsu"
+REQUIRED_MACHINE_FEATURES = "qspipsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/qspipsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb
index 79156cf5..5b4b1614 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/qspipsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "qspipsu"
+REQUIRED_MACHINE_FEATURES = "qspipsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb
index 86a9acc1..243393bb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "resetps"
+REQUIRED_MACHINE_FEATURES = "resetps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/resetps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb
index 86171bfc..c753c666 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/resetps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "resetps"
+REQUIRED_MACHINE_FEATURES = "resetps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb
index fc18adeb..ac386c4c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "rtcpsu"
+REQUIRED_MACHINE_FEATURES = "rtcpsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rtcpsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb
index 4ef2cccd..7b96bf16 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/rtcpsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "rtcpsu"
+REQUIRED_MACHINE_FEATURES = "rtcpsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb
index 5ad0ba17..cbef3ce9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "scugic"
+REQUIRED_MACHINE_FEATURES = "scugic"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scugic/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb
index 19ec303e..f079354d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/scugic_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "scugic"
+REQUIRED_MACHINE_FEATURES = "scugic"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb
index 9a5c435b..550d664b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "sdps"
+REQUIRED_MACHINE_FEATURES = "sdps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sdps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb
index dfe68bfd..4caf0e63 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "sdps"
+REQUIRED_MACHINE_FEATURES = "sdps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb
index bec085bb..71ead5d3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "spips"
+REQUIRED_MACHINE_FEATURES = "spips"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/spips/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb
index 9451d79b..ca02fda0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "spips"
+REQUIRED_MACHINE_FEATURES = "spips"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb
index 1ef37ee8..5bc007ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "sysmon"
+REQUIRED_MACHINE_FEATURES = "sysmon"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sysmon/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb
index f1be4ee6..5353f6f8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmon_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "sysmon"
+REQUIRED_MACHINE_FEATURES = "sysmon"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb
index 52e5b1e6..2c76a978 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "sysmonpsu"
+REQUIRED_MACHINE_FEATURES = "sysmonpsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sysmonpsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb
index 5056cb15..871a77a3 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "sysmonpsu"
+REQUIRED_MACHINE_FEATURES = "sysmonpsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb
index 7bd0e81d..edce2794 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "sysmonpsv"
+REQUIRED_MACHINE_FEATURES = "sysmonpsv"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sysmonpsv/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
index 06b82811..2c693809 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
@@ -1,10 +1,10 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "sysmonpsv"
+REQUIRED_MACHINE_FEATURES = "sysmonpsv"
 inherit esw python3native
-DEPENDS += "xilstandalone ${@'scugic' if d.getVar('ESW_MACHINE') != 'microblaze-plm' and d.getVar('ESW_MACHINE') != 'microblaze-psm' else ''}"
+DEPENDS += "xilstandalone ${@'scugic' if d.getVar('ESW_MACHINE') != 'psv_pmc_0' and d.getVar('ESW_MACHINE') != 'psv_psm_0' else ''}"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sysmonpsv/src/"
 ESW_COMPONENT_NAME = "libsysmonpsv.a"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb
index c13880f1..dbf3d364 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-inject_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "tmr-inject"
+REQUIRED_MACHINE_FEATURES = "tmr-inject"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb
index 9d491abb..dd91fed7 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmr-manager_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "tmr-manager"
+REQUIRED_MACHINE_FEATURES = "tmr-manager"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb
index cd971139..8224d6fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "tmrctr"
+REQUIRED_MACHINE_FEATURES = "tmrctr"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/tmrctr/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb
index 1eb38c44..cf94a9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/tmrctr_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "tmrctr"
+REQUIRED_MACHINE_FEATURES = "tmrctr"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb
index 57d6a2cb..84c5618c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "trafgen"
+REQUIRED_MACHINE_FEATURES = "trafgen"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/trafgen/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb
index d9e9238a..77d000db 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/trafgen_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "trafgen"
+REQUIRED_MACHINE_FEATURES = "trafgen"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb
index 783dce25..d294c383 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "ttcps"
+REQUIRED_MACHINE_FEATURES = "ttcps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ttcps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb
index 7de97781..ea520656 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "ttcps"
+REQUIRED_MACHINE_FEATURES = "ttcps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb
index f218e604..9aa0f598 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "uartlite"
+REQUIRED_MACHINE_FEATURES = "uartlite"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartlite/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
index 270ffb43..5998e092 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "uartlite"
+REQUIRED_MACHINE_FEATURES = "uartlite"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb
index 2e98c9f9..d81ce77b 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550-example_git.bb
@@ -1,6 +1,6 @@
 inherit esw_examples features_check
  
-REQUIRED_DISTRO_FEATURES = "uartns550"
+REQUIRED_MACHINE_FEATURES = "uartns550"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartns550/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
index 8e64457e..a08763cb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
  
-REQUIRED_DISTRO_FEATURES = "uartns550"
+REQUIRED_MACHINE_FEATURES = "uartns550"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb
index f010794a..bbff466d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "uartps"
+REQUIRED_MACHINE_FEATURES = "uartps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
index c2247736..932be9eb 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "uartps"
+REQUIRED_MACHINE_FEATURES = "uartps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb
index e881f429..78f878a6 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv-example_git.bb
@@ -1,6 +1,6 @@
 inherit esw_examples features_check
  
-REQUIRED_DISTRO_FEATURES = "uartpsv"
+REQUIRED_MACHINE_FEATURES = "uartpsv"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartpsv/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
index 266f1db9..01e48caa 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "uartpsv"
+REQUIRED_MACHINE_FEATURES = "uartpsv"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb
index e9fddd0b..0d4e113a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "usb"
+REQUIRED_MACHINE_FEATURES = "usb"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/usb/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb
index 720c73b0..9dac8cba 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "usb"
+REQUIRED_MACHINE_FEATURES = "usb"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb
index 88c983e0..4eb9bc93 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "usbpsu"
+REQUIRED_MACHINE_FEATURES = "usbpsu"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/usbpsu/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb
index a8947226..194b1f0f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/usbpsu_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "usbpsu"
+REQUIRED_MACHINE_FEATURES = "usbpsu"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb
index 21261423..068a43e9 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-csc"
+REQUIRED_MACHINE_FEATURES = "v-csc"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb
index 006452d3..741fdd91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-deinterlacer_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-deinterlacer"
+REQUIRED_MACHINE_FEATURES = "v-deinterlacer"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb
index 21f80b09..cf2cdf6f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-demosaic"
+REQUIRED_MACHINE_FEATURES = "v-demosaic"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_demosaic/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb
index 83913f31..79ef55f2 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-demosaic_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-demosaic"
+REQUIRED_MACHINE_FEATURES = "v-demosaic"
 inherit esw python3native
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_git.bb
index fcb2f95e..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_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-frmbuf-rd"
+REQUIRED_MACHINE_FEATURES = "v-frmbuf-rd"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_frmbuf_rd/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
index da248701..91ee34d8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-frmbuf-rd"
+REQUIRED_MACHINE_FEATURES = "v-frmbuf-rd"
 inherit esw python3native
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_git.bb
index 215bd250..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_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-frmbuf-wr"
+REQUIRED_MACHINE_FEATURES = "v-frmbuf-wr"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_frmbuf_wr/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
index f2ec3b27..d88ac592 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-frmbuf-wr"
+REQUIRED_MACHINE_FEATURES = "v-frmbuf-wr"
 inherit esw python3native
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_git.bb
index 8fa3e245..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_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-gamma-lut"
+REQUIRED_MACHINE_FEATURES = "v-gamma-lut"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_gamma_lut/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb
index 6d365dcd..8cf95c9d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-gamma-lut_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-gamma-lut"
+REQUIRED_MACHINE_FEATURES = "v-gamma-lut"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb
index fb3119b8..1731f984 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hcresampler_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-hcresampler"
+REQUIRED_MACHINE_FEATURES = "v-hcresampler"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb
index 17d129d1..b239380e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-hscaler_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-hscaler"
+REQUIRED_MACHINE_FEATURES = "v-hscaler"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb
index 7c0bdb12..f5ad5f4e 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-letterbox_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-letterbox"
+REQUIRED_MACHINE_FEATURES = "v-letterbox"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb
index 0597cb64..8bafbf00 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-mix"
+REQUIRED_MACHINE_FEATURES = "v-mix"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_mix/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb
index f3b8b967..acc19bd0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-mix"
+REQUIRED_MACHINE_FEATURES = "v-mix"
 inherit esw python3native
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_git.bb
index c584a558..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_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-multi-scaler"
+REQUIRED_MACHINE_FEATURES = "v-multi-scaler"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_multi_scaler/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb
index b2a9c5e5..bd725dbe 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-multi-scaler_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-multi-scaler"
+REQUIRED_MACHINE_FEATURES = "v-multi-scaler"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb
index 7b610b41..2859de79 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "v-scenechange"
+REQUIRED_MACHINE_FEATURES = "v-scenechange"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_scenechange/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb
index 91de657d..77cf9189 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-scenechange_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-scenechange"
+REQUIRED_MACHINE_FEATURES = "v-scenechange"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb
index fbc3d696..6ea70db1 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-tpg"
+REQUIRED_MACHINE_FEATURES = "v-tpg"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb
index 1f262db0..45913cdc 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vcresampler_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-vcresampler"
+REQUIRED_MACHINE_FEATURES = "v-vcresampler"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb
index 4d5ca11b..9528d2e0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-vscaler_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "v-vscaler"
+REQUIRED_MACHINE_FEATURES = "v-vscaler"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb
index 37596d56..278dee8a 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/video-common_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "video-common"
+REQUIRED_MACHINE_FEATURES = "video-common"
 inherit esw
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb
index 7c44a0f5..d9050ec4 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "vprocss"
+REQUIRED_MACHINE_FEATURES = "vprocss"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/vprocss/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb
index ea28963b..26b2852f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vprocss_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "vprocss"
+REQUIRED_MACHINE_FEATURES = "vprocss"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb
index 59d45b74..a82ae5ee 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "vtc"
+REQUIRED_MACHINE_FEATURES = "vtc"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb
index f3696e60..610a7476 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "wdtps"
+REQUIRED_MACHINE_FEATURES = "wdtps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/wdtps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb
index 8accc1aa..2c900038 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "wdtps"
+REQUIRED_MACHINE_FEATURES = "wdtps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb
index 99b65cc9..cad6ca20 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "wdttb"
+REQUIRED_MACHINE_FEATURES = "wdttb"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/wdttb/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb
index 99388577..33331c32 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "wdttb"
+REQUIRED_MACHINE_FEATURES = "wdttb"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb
index bda86f79..f8878144 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "xadcps"
+REQUIRED_MACHINE_FEATURES = "xadcps"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/xadcps/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb
index 39b2855e..85800a27 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xadcps_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "xadcps"
+REQUIRED_MACHINE_FEATURES = "xadcps"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb
index fd268ba8..26983a8f 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "xdmapcie"
+REQUIRED_MACHINE_FEATURES = "xdmapcie"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/xdmapcie/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb
index 87c7b073..cab8e9d0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xdmapcie_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "xdmapcie"
+REQUIRED_MACHINE_FEATURES = "xdmapcie"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb
index 283bea9b..d6a87183 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "xxvethernet"
+REQUIRED_MACHINE_FEATURES = "xxvethernet"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/xxvethernet/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb
index d810cf0c..491eb07c 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/xxvethernet_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "xxvethernet"
+REQUIRED_MACHINE_FEATURES = "xxvethernet"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb
index afba0f8a..e74e3279 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma-example_git.bb
@@ -1,5 +1,5 @@
 inherit esw_examples features_check
-REQUIRED_DISTRO_FEATURES = "zdma"
+REQUIRED_MACHINE_FEATURES = "zdma"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/zdma/examples/"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb
index 8e6c768c..e987f560 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "zdma"
+REQUIRED_MACHINE_FEATURES = "zdma"
 inherit esw python3native
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
index 9d0b697f..2ec1d6cd 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
@@ -25,8 +25,8 @@ ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
 ESW_COMPONENT_NAME = "libxil.a"
 DEPENDS += "xilstandalone "
-REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES}"
+REQUIRED_MACHINE_FEATURES = "${MACHINE_FEATURES}"
-PACKAGECONFIG ?= "${DISTRO_FEATURES}"
+PACKAGECONFIG ?= "${MACHINE_FEATURES}"
 do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
@@ -37,7 +37,7 @@ do_compile() {
   # Combines the .a archives produced by all of the dependent items
   cd ${RECIPE_SYSROOT}/usr/lib/
   echo create libxil.a > libxil.mri
-   for each in ${REQUIRED_DISTRO_FEATURES}; do
+   for each in ${REQUIRED_MACHINE_FEATURES}; do
     each=$(echo $each | sed 's/-/_/g')
     if [ -e lib$each.a ]; then
       echo addlib lib$each.a >> libxil.mri
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 213187e1..93f0b1e8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -1,17 +1,17 @@
 inherit esw python3native
-ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/"
+ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip213/src/"
-ESW_COMPONENT_NAME = "liblwip211.a"
+ESW_COMPONENT_NAME = "liblwip213.a"
 DEPENDS += "libxil"
 DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
-EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip213_api_mode=RAW_API"
-EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip213_dhcp_does_arp_check=ON"
-EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip213_dhcp=ON"
-EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip213_pbuf_pool_size=2048"
-EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
+EXTRA_OECMAKE += "-Dlwip213_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip_api_mode=SOCKET_API"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip213_api_mode=SOCKET_API"
 do_configure:prepend() {
    # This script should also not rely on relative paths and such
@@ -30,5 +30,5 @@ do_install() {
    install -m 0644  ${B}/include/*.h ${D}${includedir}
    cp -r ${B}/include/arch/ ${D}${includedir}
    cp -r ${B}/include/include/lwip/ ${D}${includedir}
-    cp -r ${B}/include/include/netif/ ${D}${includedir}
+    cp -r ${B}/include/netif/ ${D}${includedir}
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
index bb976377..cae39d17 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
@@ -1,7 +1,7 @@
 inherit esw deploy
 # Requires by dependency xilffs
-REQUIRED_DISTRO_FEATURES = "sdps"
+REQUIRED_MACHINE_FEATURES = "sdps"
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/examples/"
@@ -11,7 +11,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index 2a01c974..298e3033 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
@@ -1,7 +1,5 @@
 inherit esw features_check
-REQUIRED_DISTRO_FEATURES = "sdps"
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
 ESW_COMPONENT_NAME = "libxilffs.a"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
index df5c1bbe..a3fb1560 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
index 1e457d18..600369ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
index 50dbc776..77115515 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
@@ -4,3 +4,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/src/"
 ESW_COMPONENT_NAME = "libxilmailbox.a"
 DEPENDS += "xilstandalone libxil xiltimer"
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
index a656e7ec..a4a81c8b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index f58538cd..69b505c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
@@ -1,6 +1,15 @@
-inherit esw
+inherit esw python3native
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/"
 ESW_COMPONENT_NAME = "libxilpm.a"
-DEPENDS = "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else ''}"
+DEPENDS += "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
+do_configure:prepend:zynqmp() {
+    # This script should also not rely on relative paths and such
+    (
+        cd ${S}
+        lopper -f --enhanced --werror ${DTS_FILE} -- generate_config_object pm_cfg_obj.c ${ESW_MACHINE}
+        install -m 0755 pm_cfg_obj.c ${S}/${ESW_COMPONENT_SRC}/zynqmp/client/common/
+    )
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
index ad2d5c47..ca0abc12 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
index 266503d1..81bee095 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
@@ -3,4 +3,4 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/src/"
 ESW_COMPONENT_NAME = "libxilpuf.a"
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else 'xilmailbox'}"
+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_git.bb
index 2267571f..993794b5 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
    (
    cd ${S}
    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index b8e2aa16..0001d3fb 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
@@ -3,4 +3,4 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
 ESW_COMPONENT_NAME = "libxilsecure.a"
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else 'xilmailbox'}"
+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/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
index 70a46c5e..facbfbaa 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
@@ -11,6 +11,8 @@ do_configure:prepend() {
    cd ${S}
    lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/
-    install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}/common/
+    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/
    )
 }
author	Mark Hatle <mark.hatle@amd.com>	2023-05-18 13:18:29 -0600
committer	Mark Hatle <mark.hatle@amd.com>	2023-05-18 14:59:03 -0600
commit	96363a1fada8f5dca874917e47899e7f6dd26b43 (patch)
tree	60a031689d7c6bb11640136a00e2e44eedfc3868 /meta-xilinx-standalone-experimental
parent	fe4b15d97e0b5ce73cd3186ac3e380df07c9d1ca (diff)
parent	d4732aa636e6764c64030083a20975283c2352d5 (diff)
download	meta-xilinx-96363a1fada8f5dca874917e47899e7f6dd26b43.tar.gz