From 0ba2651d60275333125efad9456e7b6b484bbf3d Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Tue, 15 Nov 2022 17:33:03 +0530
Subject: meta-xilinx-standalone-experimental: Update as per latest lopper
 updates

lopper baremeal assists got updated to take cpu name as input instead of
yocto machine name this commit updates the dt-processor.sh script for the
same, and also adds support for generating mulit config machine for Other
processor cores (Cortexr5-1 etc...)

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb     | 2 +-
 meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb    | 2 +-
 meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index f58538cd..90aa5933 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
@@ -3,4 +3,4 @@ inherit esw
 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') == 'ub1_cpu_pmc' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
index 266503d1..46a5ae45 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') == 'ub1_cpu_pmc' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index b8e2aa16..b8c57eba 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') == 'ub1_cpu_pmc' else 'xilmailbox'}"
-- 
cgit v1.2.3-54-g00ecf


From 647d69df783bb84f193eeaab82159c3f698cbb94 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Thu, 1 Dec 2022 07:28:39 -0800
Subject: lwip_git: Fix incorrect override syntax

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index bced1499..213187e1 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -11,7 +11,7 @@ EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
 EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
 EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
 EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip_api_mode=SOCKET_API"
 
 do_configure:prepend() {
     # This script should also not rely on relative paths and such
-- 
cgit v1.2.3-54-g00ecf


From c56f1380b4b49c9a463fa73ccb03618fa1008fd6 Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Fri, 2 Dec 2022 22:03:41 +0530
Subject: meta-xilinx-standalone-experimental: update recipes as per 2023.1
 embeddedsw repo changes

Update recipes and readme as per 2023.1 embeddedsw repo and as per
latest lopper changes.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../classes/esw.bbclass                            |  3 +++
 .../conf/dtb-embeddedsw.inc                        |  7 ++++---
 .../empty-application/empty-application_git.bb     |  1 +
 .../freertos-hello-world_git.bb                    |  1 +
 .../freertos-lwip-echo-server_git.bb               |  1 +
 .../freertos-lwip-tcp-perf-client_git.bb           |  1 +
 .../freertos-lwip-tcp-perf-server_git.bb           |  1 +
 .../freertos-lwip-udp-perf-client_git.bb           |  1 +
 .../freertos-lwip-udp-perf-server_git.bb           |  1 +
 .../hello-world/hello-world_git.bb                 |  1 +
 .../lwip-echo-server/lwip-echo-server_git.bb       |  1 +
 .../lwip-tcp-perf-client_git.bb                    |  1 +
 .../lwip-tcp-perf-server_git.bb                    |  1 +
 .../lwip-udp-perf-client_git.bb                    |  1 +
 .../lwip-udp-perf-server_git.bb                    |  1 +
 .../memory-tests/memory-tests_git.bb               |  1 +
 .../peripheral-tests/peripheral-tests_git.bb       |  7 ++-----
 .../recipes-core/meta/files/README-setup           | 24 +++++++++++-----------
 .../recipes-core/meta/files/dt-processor.sh        | 20 +++++++++---------
 .../recipes-libraries/xilmailbox_git.bb            |  9 ++++++++
 .../recipes-libraries/xilsecure_git.bb             |  2 +-
 .../recipes-libraries/xilstandalone_git.bb         |  2 +-
 22 files changed, 56 insertions(+), 32 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index 1fd3366e..42c9e4ac 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -78,6 +78,9 @@ 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_EXPORT_COMPILE_COMMANDS ON)
+    set( CMAKE_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR})
     add_definitions( "${XLNX_CMAKE_BSP_VARS}" )
 EOF
 }
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
index 2b461993..bcb35aba 100644
--- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
+++ b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
@@ -4,9 +4,10 @@
 # Make it clear decoupling is 'experimental' in the version
 ESW_VER = "experimental"
 
-REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https"
+REPO = "git://gitenterprise.xilinx.com/decoupling/embeddedsw-experimental-dt-support.git;protocol=https"
 
-ESW_BRANCH[experimental] = "xlnx_rel_v2022.1_sdt_experimental_beta"
-ESW_REV[experimental] = "2f93defe078000965c8f7203da11817c9f0982d1"
+ESW_BRANCH[experimental] = "xlnx_rel_v2023.1_sdt_experimental"
+ESW_REV[experimental] = "9d4f60b714513da97b93d89a22f59e95f580b52e"
 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'
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..f7257864 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
@@ -13,6 +13,7 @@ do_configure:prepend() {
     install -m 0755 memory.ld ${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
     )
 }
 
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..d5af2b17 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..1fd29af8 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..b4264c64 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..69c9149e 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..e39d5dbe 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..12f8e799 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..36263407 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
@@ -12,6 +12,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..b59f3b37 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..ac8c7c7f 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..144a0fdc 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..05bb1013 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..d2b4e0f5 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
@@ -10,6 +10,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..cfae1ba4 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
@@ -12,6 +12,7 @@ do_configure:prepend() {
     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
     )
 }
 
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..d2e5a5b7 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
@@ -12,6 +12,7 @@ do_configure:prepend() {
     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
     )
 }
 
@@ -30,12 +31,8 @@ python do_generate_app_data() {
         bb.error("Couldn't find source dir %s" % d.getVar('OECMAKE_SOURCEPATH'))
 
     driver_name = d.getVar('REQUIRED_DISTRO_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"
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..eb2db98b 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -46,16 +46,16 @@ To enable this, add the following to your local.conf:
 BASE_TMPDIR = "${TOPDIR}"
 require conf/cortexa53-zynqmp-linux.conf
 SYSTEM_DTFILE = "/proj/yocto/zu_sdt/system-top.dts"
-BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexa53-zynqmp-freertos cortexr5-zynqmp-fsbl-baremetal cortexr5-zynqmp-baremetal cortexr5-zynqmp-freertos microblaze-pmu"
+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"
 FSBL_DEPENDS = ""
-FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
-FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+FSBL_MCDEPENDS = "mc::cortexa53-0-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-0-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
 R5FSBL_DEPENDS = ""
-R5FSBL_MCDEPENDS = "mc::cortexr5-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
-R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+R5FSBL_MCDEPENDS = "mc::cortexr5-0-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-0-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
 PMU_DEPENDS = ""
-PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy"
-PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
+PMU_MCDEPENDS = "mc::microblaze-0-pmu:pmu-firmware:do_deploy"
+PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-pmu/deploy/images/${MACHINE}"
 
 #
 # OR
@@ -72,13 +72,13 @@ To enable this, add the following to your local.conf:
 BASE_TMPDIR = "${TOPDIR}"
 require conf/cortexa72-versal-linux.conf
 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"
+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"
 PLM_DEPENDS = ""
-PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy"
-PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
+PLM_MCDEPENDS = "mc::microblaze-0-pmc:plm-firmware:do_deploy"
+PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-pmc/deploy/images/${MACHINE}"
 PSM_DEPENDS = ""
-PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy"
-PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
+PSM_MCDEPENDS = "mc::microblaze-0-psm:psm-firmware:do_deploy"
+PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-psm/deploy/images/${MACHINE}"
 PDI_PATH = "__PATH TO PDI FILE HERE__"
 
 # NOTE: On versal, you MUST specify the PDI file as directed by the instructions.
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 02b4466b..ce41096c 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
@@ -275,7 +275,7 @@ cortex_a53_freertos() {
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
 
-  dtb_file="cortexa53-${machine}${suffix}-freertos.dtb"
+  dtb_file="cortexa53-$2-${machine}${suffix}-freertos.dtb"
   multiconf="${multiconf} cortexa53-$2-${machine}${suffix}-freertos"
   conf_file="multiconfig/cortexa53-$2-${machine}${suffix}-freertos.conf"
   libxil="multiconfig/includes/cortexa53-${machine}${suffix}-libxil.conf"
@@ -692,9 +692,9 @@ pmu-microblaze() {
 
   process_microblaze
 
-  dtb_file="microblaze-pmu.dtb"
-  multiconf="${multiconf} microblaze-pmu"
-  conf_file="multiconfig/microblaze-pmu.conf"
+  dtb_file="microblaze-0-pmu.dtb"
+  multiconf="${multiconf} microblaze-0-pmu"
+  conf_file="multiconfig/microblaze-0-pmu.conf"
   libxil="multiconfig/includes/microblaze-pmu-libxil.conf"
   distro="multiconfig/includes/microblaze-pmu-distro.conf"
 
@@ -750,9 +750,9 @@ pmc-microblaze() {
 
   process_microblaze
 
-  dtb_file="microblaze-pmc.dtb"
-  multiconf="${multiconf} microblaze-pmc"
-  conf_file="multiconfig/microblaze-pmc.conf"
+  dtb_file="microblaze-0-pmc.dtb"
+  multiconf="${multiconf} microblaze-0-pmc"
+  conf_file="multiconfig/microblaze-0-pmc.conf"
   libxil="multiconfig/includes/microblaze-pmc-libxil.conf"
   distro="multiconfig/includes/microblaze-pmc-distro.conf"
 
@@ -808,9 +808,9 @@ psm-microblaze() {
 
   process_microblaze
 
-  dtb_file="microblaze-psm.dtb"
-  multiconf="${multiconf} microblaze-psm"
-  conf_file="multiconfig/microblaze-psm.conf"
+  dtb_file="microblaze-0-psm.dtb"
+  multiconf="${multiconf} microblaze-0-psm"
+  conf_file="multiconfig/microblaze-0-psm.conf"
   libxil="multiconfig/includes/microblaze-psm-libxil.conf"
   distro="multiconfig/includes/microblaze-psm-distro.conf"
 
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/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index b8c57eba..cb461024 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') == 'ub1_cpu_pmc' else 'xilmailbox'}"
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'ub1_cpu_pmc' else ''} ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' and d.getVar('ESW_MACHINE') != 'ub1_cpu_pmc' 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..a34ad964 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
@@ -11,6 +11,6 @@ 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}
     )
 }
-- 
cgit v1.2.3-54-g00ecf


From 318ab6bc335452b299e4c667da3ed9b562dc8fd3 Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Wed, 28 Dec 2022 18:21:32 +0530
Subject: meta-xilinx-standalone-experimental: Update machine name checks to
 inline with latest system device-tree

system device-tree repo (DTG++) has updated the processor label names
to inline with xsa ip naming, update the machine checks in the recipes
for the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/classes/esw.bbclass               | 4 ++--
 meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb  | 2 +-
 meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb    | 2 +-
 meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb   | 2 +-
 .../recipes-libraries/xilsecure_git.bb                                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index 42c9e4ac..b223f8ae 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -47,9 +47,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 == 'ub1_cpu_pmu'):
+        if (machine == 'psu_pmu_0'):
             cmake_processor = 'pmu_microblaze'
-        elif (machine == 'ub1_cpu_pmc'):
+        elif (machine == 'psv_pmc_0'):
             cmake_processor = 'plm_microblaze'
         else:
             cmake_processor = 'microblaze'
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
index 45ef6688..2d794d68 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
@@ -4,7 +4,7 @@ REQUIRED_DISTRO_FEATURES = "sysmonpsv"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone ${@'scugic' if d.getVar('ESW_MACHINE') != 'ub1_cpu_pmc' and d.getVar('ESW_MACHINE') != 'ub2_cpu_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-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index 90aa5933..47431446 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
@@ -3,4 +3,4 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/"
 ESW_COMPONENT_NAME = "libxilpm.a"
 
-DEPENDS = "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'ub1_cpu_pmc' else ''}"
+DEPENDS = "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
index 46a5ae45..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') == 'ub1_cpu_pmc' 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_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index cb461024..1059d0b3 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') == 'ub1_cpu_pmc' else ''} ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' and d.getVar('ESW_MACHINE') != 'ub1_cpu_pmc' else ''}"
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''} ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' and d.getVar('ESW_MACHINE') != 'psv_pmc_0' else ''}"
-- 
cgit v1.2.3-54-g00ecf


From 7702ecaf7818caaa3347dd5cfa9eab3ec251697c Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Wed, 28 Dec 2022 18:21:33 +0530
Subject: meta-xilinx-standalone-experimental: Update recipes as per latest
 lopper updates

With the latest lopper changes memory.ld file is no longer getting
generated update the recipes for the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/classes/esw_examples.bbclass        | 1 -
 .../recipes-applications/empty-application/empty-application_git.bb     | 1 -
 .../freertos-hello-world/freertos-hello-world_git.bb                    | 1 -
 .../freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb          | 1 -
 .../freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb  | 1 -
 .../freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb  | 1 -
 .../freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb  | 1 -
 .../freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb  | 1 -
 .../recipes-applications/hello-world/hello-world_git.bb                 | 1 -
 .../recipes-applications/lwip-echo-server/lwip-echo-server_git.bb       | 1 -
 .../lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb                    | 1 -
 .../lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb                    | 1 -
 .../lwip-udp-perf-client/lwip-udp-perf-client_git.bb                    | 1 -
 .../lwip-udp-perf-server/lwip-udp-perf-server_git.bb                    | 1 -
 .../recipes-applications/memory-tests/memory-tests_git.bb               | 1 -
 .../recipes-applications/peripheral-tests/peripheral-tests_git.bb       | 1 -
 .../recipes-drivers/clockps-example_git.bb                              | 1 -
 .../recipes-libraries/xilffs-example_git.bb                             | 1 -
 .../recipes-libraries/xilfpga-example_git.bb                            | 1 -
 .../recipes-libraries/xilmailbox-example_git.bb                         | 1 -
 .../recipes-libraries/xilnvm-example_git.bb                             | 1 -
 .../recipes-libraries/xilpuf-example_git.bb                             | 1 -
 .../recipes-libraries/xilsecure-example_git.bb                          | 1 -
 .../recipes-libraries/xilstandalone_git.bb                              | 2 ++
 24 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

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/recipes-applications/empty-application/empty-application_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
index f7257864..19475fc5 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,7 +10,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}/
     install -m 0644 ${CUSTOM_SRCFILE}/* ${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-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
index d5af2b17..6b69edd6 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,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}/
     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 1fd29af8..8682e8f4 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,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}/
     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 b4264c64..672c0647 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,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}/
     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 69c9149e..1e2d9c2b 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,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}/
     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 e39d5dbe..a3e8f8d5 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,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}/
     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-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 12f8e799..fc2e0107 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 36263407..b447dfe9 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,7 +10,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 b59f3b37..2b577efb 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 ac8c7c7f..408e1211 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 144a0fdc..eabcbf84 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 05bb1013..490f0c89 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 d2b4e0f5..2eac10ce 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,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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 cfae1ba4..a172c863 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,7 +10,6 @@ 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
     )
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 d2e5a5b7..75386782 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,7 +10,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}/
     cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files
     )
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..38e242b0 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
@@ -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-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
index bb976377..56b03cca 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
@@ -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/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/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/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/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/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
index a34ad964..facbfbaa 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
@@ -12,5 +12,7 @@ do_configure:prepend() {
     lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
     install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 StandaloneExample.cmake ${S}/${ESW_COMPONENT_SRC}/common/
     )
 }
-- 
cgit v1.2.3-54-g00ecf


From 753ef3ac21624ad350c1ce520a1b69f8690909ce Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Sun, 15 Jan 2023 08:28:25 -0800
Subject: meta-xilinx-standalone-experimetnal: Move from using DISTRO to
 MACHINE features

Using DISTRO_FEATURES will affect task hashes for non-target recipes.  This
triggers some signficant unnecessary rebuilds.

Since these options all point back to a given device-tree (related) setting
they really are machine, not distribution specific anyway.  So the change
should also better align to the purpose of the settings.

Additionally, change dt-processor.sh to generate MACHINE_FEATURES instead of
DISTRO_FEATURES.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/classes/esw.bbclass          | 2 +-
 .../peripheral-tests/peripheral-tests_git.bb                     | 2 +-
 .../recipes-core/meta/files/dt-processor.sh                      | 9 +++++++++
 meta-xilinx-standalone-experimental/recipes-drivers/avbuf_git.bb | 2 +-
 .../recipes-drivers/axicdma-example_git.bb                       | 2 +-
 .../recipes-drivers/axicdma_git.bb                               | 2 +-
 .../recipes-drivers/axidma-example_git.bb                        | 2 +-
 .../recipes-drivers/axidma_git.bb                                | 2 +-
 .../recipes-drivers/axiethernet-example_git.bb                   | 2 +-
 .../recipes-drivers/axiethernet_git.bb                           | 2 +-
 .../recipes-drivers/axipmon-example_git.bb                       | 2 +-
 .../recipes-drivers/axipmon_git.bb                               | 2 +-
 .../recipes-drivers/axis-switch_git.bb                           | 2 +-
 .../recipes-drivers/axivdma-example_git.bb                       | 2 +-
 .../recipes-drivers/axivdma_git.bb                               | 2 +-
 .../recipes-drivers/bram-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/bram_git.bb  | 2 +-
 .../recipes-drivers/can-example_git.bb                           | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/can_git.bb   | 2 +-
 .../recipes-drivers/canfd-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/canfd_git.bb | 2 +-
 .../recipes-drivers/canps-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/canps_git.bb | 2 +-
 .../recipes-drivers/cframe_git.bb                                | 2 +-
 .../recipes-drivers/cfupmc_git.bb                                | 2 +-
 .../recipes-drivers/clk-wiz_git.bb                               | 2 +-
 .../recipes-drivers/clockps-example_git.bb                       | 2 +-
 .../recipes-drivers/clockps_git.bb                               | 2 +-
 .../recipes-drivers/common_git.bb                                | 8 ++++----
 .../recipes-drivers/coresightps-dcc_git.bb                       | 2 +-
 .../recipes-drivers/csudma-example_git.bb                        | 2 +-
 .../recipes-drivers/csudma_git.bb                                | 2 +-
 .../recipes-drivers/ddrcpsu_git.bb                               | 2 +-
 .../recipes-drivers/devcfg-example_git.bb                        | 2 +-
 .../recipes-drivers/devcfg_git.bb                                | 2 +-
 .../recipes-drivers/dfxasm-example_git.bb                        | 2 +-
 .../recipes-drivers/dfxasm_git.bb                                | 2 +-
 .../recipes-drivers/dmaps-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/dpdma_git.bb | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/dppsu_git.bb | 2 +-
 .../recipes-drivers/emaclite-example_git.bb                      | 2 +-
 .../recipes-drivers/emaclite_git.bb                              | 2 +-
 .../recipes-drivers/emacps-example_git.bb                        | 2 +-
 .../recipes-drivers/emacps_git.bb                                | 2 +-
 .../recipes-drivers/gpio-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/gpio_git.bb  | 2 +-
 .../recipes-drivers/gpiops-example_git.bb                        | 2 +-
 .../recipes-drivers/gpiops_git.bb                                | 2 +-
 .../recipes-drivers/iic-example_git.bb                           | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/iic_git.bb   | 2 +-
 .../recipes-drivers/iicps-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/iicps_git.bb | 2 +-
 .../recipes-drivers/intc-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/intc_git.bb  | 2 +-
 .../recipes-drivers/iomodule_git.bb                              | 2 +-
 .../recipes-drivers/ipipsu-example_git.bb                        | 2 +-
 .../recipes-drivers/ipipsu_git.bb                                | 2 +-
 .../recipes-drivers/llfifo-example_git.bb                        | 2 +-
 .../recipes-drivers/llfifo_git.bb                                | 2 +-
 .../recipes-drivers/mbox-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/mbox_git.bb  | 2 +-
 .../recipes-drivers/mcdma-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/mcdma_git.bb | 2 +-
 .../recipes-drivers/mutex-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/mutex_git.bb | 2 +-
 .../recipes-drivers/nandpsu-example_git.bb                       | 2 +-
 .../recipes-drivers/nandpsu_git.bb                               | 2 +-
 .../recipes-drivers/ospipsv-example_git.bb                       | 2 +-
 .../recipes-drivers/ospipsv_git.bb                               | 2 +-
 .../recipes-drivers/pciepsu-example_git.bb                       | 2 +-
 .../recipes-drivers/pciepsu_git.bb                               | 2 +-
 .../recipes-drivers/qspips-example_git.bb                        | 2 +-
 .../recipes-drivers/qspips_git.bb                                | 2 +-
 .../recipes-drivers/qspipsu-example_git.bb                       | 2 +-
 .../recipes-drivers/qspipsu_git.bb                               | 2 +-
 .../recipes-drivers/resetps-example_git.bb                       | 2 +-
 .../recipes-drivers/resetps_git.bb                               | 2 +-
 .../recipes-drivers/rtcpsu-example_git.bb                        | 2 +-
 .../recipes-drivers/rtcpsu_git.bb                                | 2 +-
 .../recipes-drivers/scugic-example_git.bb                        | 2 +-
 .../recipes-drivers/scugic_git.bb                                | 2 +-
 .../recipes-drivers/sdps-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/sdps_git.bb  | 2 +-
 .../recipes-drivers/spips-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/spips_git.bb | 2 +-
 .../recipes-drivers/sysmon-example_git.bb                        | 2 +-
 .../recipes-drivers/sysmon_git.bb                                | 2 +-
 .../recipes-drivers/sysmonpsu-example_git.bb                     | 2 +-
 .../recipes-drivers/sysmonpsu_git.bb                             | 2 +-
 .../recipes-drivers/sysmonpsv-example_git.bb                     | 2 +-
 .../recipes-drivers/sysmonpsv_git.bb                             | 2 +-
 .../recipes-drivers/tmr-inject_git.bb                            | 2 +-
 .../recipes-drivers/tmr-manager_git.bb                           | 2 +-
 .../recipes-drivers/tmrctr-example_git.bb                        | 2 +-
 .../recipes-drivers/tmrctr_git.bb                                | 2 +-
 .../recipes-drivers/trafgen-example_git.bb                       | 2 +-
 .../recipes-drivers/trafgen_git.bb                               | 2 +-
 .../recipes-drivers/ttcps-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/ttcps_git.bb | 2 +-
 .../recipes-drivers/uartlite-example_git.bb                      | 2 +-
 .../recipes-drivers/uartlite_git.bb                              | 2 +-
 .../recipes-drivers/uartns550-example_git.bb                     | 2 +-
 .../recipes-drivers/uartns550_git.bb                             | 2 +-
 .../recipes-drivers/uartps-example_git.bb                        | 2 +-
 .../recipes-drivers/uartps_git.bb                                | 2 +-
 .../recipes-drivers/uartpsv-example_git.bb                       | 2 +-
 .../recipes-drivers/uartpsv_git.bb                               | 2 +-
 .../recipes-drivers/usb-example_git.bb                           | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/usb_git.bb   | 2 +-
 .../recipes-drivers/usbpsu-example_git.bb                        | 2 +-
 .../recipes-drivers/usbpsu_git.bb                                | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/v-csc_git.bb | 2 +-
 .../recipes-drivers/v-deinterlacer_git.bb                        | 2 +-
 .../recipes-drivers/v-demosaic-example_git.bb                    | 2 +-
 .../recipes-drivers/v-demosaic_git.bb                            | 2 +-
 .../recipes-drivers/v-frmbuf-rd-example_git.bb                   | 2 +-
 .../recipes-drivers/v-frmbuf-rd_git.bb                           | 2 +-
 .../recipes-drivers/v-frmbuf-wr-example_git.bb                   | 2 +-
 .../recipes-drivers/v-frmbuf-wr_git.bb                           | 2 +-
 .../recipes-drivers/v-gamma-lut-example_git.bb                   | 2 +-
 .../recipes-drivers/v-gamma-lut_git.bb                           | 2 +-
 .../recipes-drivers/v-hcresampler_git.bb                         | 2 +-
 .../recipes-drivers/v-hscaler_git.bb                             | 2 +-
 .../recipes-drivers/v-letterbox_git.bb                           | 2 +-
 .../recipes-drivers/v-mix-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/v-mix_git.bb | 2 +-
 .../recipes-drivers/v-multi-scaler-example_git.bb                | 2 +-
 .../recipes-drivers/v-multi-scaler_git.bb                        | 2 +-
 .../recipes-drivers/v-scenechange-example_git.bb                 | 2 +-
 .../recipes-drivers/v-scenechange_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/v-tpg_git.bb | 2 +-
 .../recipes-drivers/v-vcresampler_git.bb                         | 2 +-
 .../recipes-drivers/v-vscaler_git.bb                             | 2 +-
 .../recipes-drivers/video-common_git.bb                          | 2 +-
 .../recipes-drivers/vprocss-example_git.bb                       | 2 +-
 .../recipes-drivers/vprocss_git.bb                               | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/vtc_git.bb   | 2 +-
 .../recipes-drivers/wdtps-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/wdtps_git.bb | 2 +-
 .../recipes-drivers/wdttb-example_git.bb                         | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/wdttb_git.bb | 2 +-
 .../recipes-drivers/xadcps-example_git.bb                        | 2 +-
 .../recipes-drivers/xadcps_git.bb                                | 2 +-
 .../recipes-drivers/xdmapcie-example_git.bb                      | 2 +-
 .../recipes-drivers/xdmapcie_git.bb                              | 2 +-
 .../recipes-drivers/xxvethernet-example_git.bb                   | 2 +-
 .../recipes-drivers/xxvethernet_git.bb                           | 2 +-
 .../recipes-drivers/zdma-example_git.bb                          | 2 +-
 meta-xilinx-standalone-experimental/recipes-drivers/zdma_git.bb  | 2 +-
 .../recipes-libraries/libxil_git.bb                              | 6 +++---
 .../recipes-libraries/xilffs-example_git.bb                      | 2 +-
 .../recipes-libraries/xilffs_git.bb                              | 2 +-
 152 files changed, 165 insertions(+), 156 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index b223f8ae..bcea3568 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -121,7 +121,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/recipes-applications/peripheral-tests/peripheral-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
index 7d94b807..d126320d 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
@@ -29,7 +29,7 @@ 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"] + ["-O"] + [src_dir[0]] + [system_dt[0]] + ["--"] + ["baremetal_gentestapp_xlnx"] + [machine] + [srcdir[0]]
     subprocess.run(command, check = True)
 }
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 1f4e9148..26dd8eea 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
@@ -249,6 +249,7 @@ cortex_a53_baremetal() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   if [ "$1" = "fsbl" ]; then
     if [ ! -e "${psu_init_path}/psu_init.c" ]; then
@@ -316,6 +317,7 @@ cortex_a53_freertos() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -446,6 +448,7 @@ cortex_a72_baremetal() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -499,6 +502,7 @@ cortex_a72_freertos() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -567,6 +571,7 @@ cortex_r5_baremetal() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   if [ "$1" = "fsbl" ]; then
     if [ ! -e "${psu_init_path}/psu_init.c" ]; then
@@ -634,6 +639,7 @@ cortex_r5_freertos() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -703,6 +709,7 @@ pmu-microblaze() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -755,6 +762,7 @@ pmc-microblaze() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
@@ -807,6 +815,7 @@ psm-microblaze() {
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
+  sed -i ${distro} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
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 38e242b0..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"
 
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)} \
-		  ${@bb.utils.contains("DISTRO_FEATURES", "scugic", "scugic", "", d)} \
-		  ${@bb.utils.contains("DISTRO_FEATURES", "intc", "intc", "", d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains("MACHINE_FEATURES", "clockps", "clockps", "", d)} \
+		  ${@bb.utils.contains("MACHINE_FEATURES", "scugic", "scugic", "", 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 2d794d68..2c693809 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/sysmonpsv_git.bb
@@ -1,6 +1,6 @@
 inherit features_check
 
-REQUIRED_DISTRO_FEATURES = "sysmonpsv"
+REQUIRED_MACHINE_FEATURES = "sysmonpsv"
 
 inherit esw python3native
 
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 75c54837..04e5e81a 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
@@ -8,8 +8,8 @@ ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
 ESW_COMPONENT_NAME = "libxil.a"
 
 DEPENDS += "xilstandalone "
-REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES}"
-PACKAGECONFIG ?= "${DISTRO_FEATURES}"
+REQUIRED_MACHINE_FEATURES = "${MACHINE_FEATURES}"
+PACKAGECONFIG ?= "${MACHINE_FEATURES}"
 
 do_configure:prepend() {
     LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
@@ -20,7 +20,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/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
index 56b03cca..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/"
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index 8792fdbd..b40ea2ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
@@ -1,6 +1,6 @@
 inherit esw
 
-REQUIRED_DISTRO_FEATURES = "sdps"
+REQUIRED_MACHINE_FEATURES = "sdps"
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
 ESW_COMPONENT_NAME = "libxilffs.a"
-- 
cgit v1.2.3-54-g00ecf


From ede3354d41a97de08bfa8ce009f0e9370047fe01 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Sun, 15 Jan 2023 11:48:45 -0800
Subject: libxil: Move from require to include

Due to the change of the machine.conf where LIBXIL_CONFIG is set to the
multiconfig, some non-baremetal configurations may not generate a config
file.  Using include will prevent this from being an early parse error,
while the python function will disble libxil when no configuration file
is present.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-libraries/libxil_git.bb                   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
index 04e5e81a..2ec1d6cd 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
@@ -1,8 +1,25 @@
 inherit esw python3native features_check
 
 LIBXIL_CONFIG ??= ""
+include ${LIBXIL_CONFIG}
 
-require ${LIBXIL_CONFIG}
+# The python code allows us to use an include above, instead of require
+# as it enforces that the file will be available for inclusion.  It also
+# gives the user feedback if something isn't configured properly.
+python () {
+    libxil_cfg = d.getVar("LIBXIL_CONFIG")
+    if libxil_cfg:
+        bbpath = d.getVar('BBPATH')
+        libxil_path = bb.utils.which(bbpath, libxil_cfg)
+        if libxil_path:
+            return
+        else:
+            d.setVar('BB_DONT_CACHE', '1')
+            bb.parse.SkipRecipe("LIBXIL_CONFIG (%s) was not found." % libxil_cfg)
+    else:
+        d.setVar('BB_DONT_CACHE', '1')
+        raise bb.parse.SkipRecipe("No LIBXIL_CONFIG set.")
+}
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
 ESW_COMPONENT_NAME = "libxil.a"
-- 
cgit v1.2.3-54-g00ecf


From ce490fceff8eef8cab9b1413c1594227a3e6cb1f Mon Sep 17 00:00:00 2001
From: Madhav Bhatt <madhav.bhatt@amd.com>
Date: Mon, 16 Jan 2023 07:43:09 -0800
Subject: meta-xilinx-standalone-experimental: recipes-libraries: Include
 config object generation by lopper

Add support for the config object generation for given system device
tree using lopper plugin for zynqmp.

Signed-off-by: Madhav Bhatt <madhav.bhatt@amd.com>

Reworked the format of the prepend

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-libraries/xilpm_git.bb                          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index 47431446..f514bc2b 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') == 'psv_pmc_0' 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}/
+    )
+}
-- 
cgit v1.2.3-54-g00ecf


From c31172e77ad3c8e01cdf13dee83ea3a0ca4108bd Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Fri, 10 Feb 2023 23:26:12 +0530
Subject: meta-xilinx-standalone-experimental: recipes-libraries: xilpm: Fix
 pm_cfg_obj copy location

xilpm library source structure is expecting the pm_cfg_obj.c file to be
available at src/zynqmp/client/common location, update the recipe for
the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index f514bc2b..69b505c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
@@ -10,6 +10,6 @@ do_configure:prepend:zynqmp() {
     (
         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}/
+        install -m 0755 pm_cfg_obj.c ${S}/${ESW_COMPONENT_SRC}/zynqmp/client/common/
     )
 }
-- 
cgit v1.2.3-54-g00ecf


From 0a7b0bf69fc38f61feb6973bd3733652103c5c96 Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Fri, 10 Feb 2023 23:26:13 +0530
Subject: meta-xilinx-standalone-experimental: recipes-libraries: lwip: Update
 config parameters as per latest source code

In the latest esw source code lwip library sofware config parameter
prefix got changed from lwip_* to lwip211_* update the recipe for the
same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-libraries/lwip_git.bb                          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 213187e1..1fb660a4 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -6,12 +6,12 @@ ESW_COMPONENT_NAME = "liblwip211.a"
 DEPENDS += "libxil"
 DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
 
-EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API"
-EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
-EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
-EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
-EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip_api_mode=SOCKET_API"
+EXTRA_OECMAKE += "-Dlwip211_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip211_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip211_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip211_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip211_ipv6_enable=OFF"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip211_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}
 }
-- 
cgit v1.2.3-54-g00ecf


From ec9bbae64508e188f385508336f0ea2929311a64 Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Thu, 2 Mar 2023 12:56:22 +0530
Subject: meta-xilinx-standalone-experimental: recipes-libraries: lwip: Update
 recipe as per latest source changes

In 2023.1 release lwip library got upgraded from lwip211 to lwip213
update the recipe for the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-libraries/lwip_git.bb                        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 1fb660a4..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_NAME = "liblwip211.a"
+ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip213/src/"
+ESW_COMPONENT_NAME = "liblwip213.a"
 
 DEPENDS += "libxil"
 DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
 
-EXTRA_OECMAKE += "-Dlwip211_api_mode=RAW_API"
-EXTRA_OECMAKE += "-Dlwip211_dhcp_does_arp_check=ON"
-EXTRA_OECMAKE += "-Dlwip211_dhcp=ON"
-EXTRA_OECMAKE += "-Dlwip211_pbuf_pool_size=2048"
-EXTRA_OECMAKE += "-Dlwip211_ipv6_enable=OFF"
-EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip211_api_mode=SOCKET_API"
+EXTRA_OECMAKE += "-Dlwip213_api_mode=RAW_API"
+EXTRA_OECMAKE += "-Dlwip213_dhcp_does_arp_check=ON"
+EXTRA_OECMAKE += "-Dlwip213_dhcp=ON"
+EXTRA_OECMAKE += "-Dlwip213_pbuf_pool_size=2048"
+EXTRA_OECMAKE += "-Dlwip213_ipv6_enable=OFF"
+EXTRA_OECMAKE:append:xilinx-freertos = " -Dlwip213_api_mode=SOCKET_API"
 
 do_configure:prepend() {
     # This script should also not rely on relative paths and such
-- 
cgit v1.2.3-54-g00ecf


From ef2c8a0465fa9373597502ebf779c6e0ee8c5517 Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Thu, 2 Mar 2023 12:56:24 +0530
Subject: meta-xilinx-standalone-experimental: recipes-libraries: xilsecure:
 Update recipe DEPENDS checks as per latest changes

With the latest changes MACHINE name no longer be generated as
versal-generic update the checks in the recipe for the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index 1059d0b3..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') == 'psv_pmc_0' else ''} ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' and d.getVar('ESW_MACHINE') != 'psv_pmc_0' else ''}"
+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 ''}"
-- 
cgit v1.2.3-54-g00ecf


From da5e91d582c1ad58eb090541a655792806474293 Mon Sep 17 00:00:00 2001
From: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Date: Thu, 2 Mar 2023 18:50:45 -0700
Subject: xilffs_git: Fix features check QA issue

xilffs warnings are obversed due to missing features_check inhert.
Hence inherit features_check bbclass to fix QA warnings.

WARNING: mc:microblaze-0-pmc:xilffs-2023.1_sdt_experimental+gitAUTOINC+4ab00f250f-r0 do_package_qa: QA Issue: xilffs: recipe doesn't inherit features_check [unhandled-features-check]

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index b40ea2ad..d5f12de5 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
@@ -1,4 +1,4 @@
-inherit esw
+inherit esw features_check
 
 REQUIRED_MACHINE_FEATURES = "sdps"
 
-- 
cgit v1.2.3-54-g00ecf


From 6d34fa4c6781559a0d17b6079d3cb818ab2a37ae Mon Sep 17 00:00:00 2001
From: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Date: Tue, 21 Mar 2023 17:07:04 +0530
Subject: meta-xilinx-standalone-experimental: recipes-libraries: xilffs:
 Remove unneeded required distro feature check

xilffs should be compiled if the design has no sd peripheral update the
recipe for the same.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
(cherry picked from commit abffd2fb1afe76d4e89140aaaafb562fe6b280d4)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index d5f12de5..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_MACHINE_FEATURES = "sdps"
-
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
 ESW_COMPONENT_NAME = "libxilffs.a"
 
-- 
cgit v1.2.3-54-g00ecf


From 5f4dd028f983d664ba62fd3e611b261c8de4ea46 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Mon, 27 Mar 2023 17:10:19 -0500
Subject: meta-xilinx-standalone-experimental: recipes-libraries: xilffs:
 Remove features check

Previous commit (abffd2fb1afe76d4e89140aaaafb562fe6b280d4) already
removed the feature to be checked, but this resulted in a warning
about the features_check being loaded, but not checking anything.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
(cherry picked from commit 57776e5592ec5a6ef647bdd8fcf836b70e8c9be5)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta-xilinx-standalone-experimental/recipes-libraries')

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index 298e3033..b8dc3b33 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
@@ -1,4 +1,4 @@
-inherit esw features_check
+inherit esw
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
 ESW_COMPONENT_NAME = "libxilffs.a"
-- 
cgit v1.2.3-54-g00ecf