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

Resolved conflicts
Preserved 2022* versions

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

14 files changed, 38 insertions, 26 deletions

diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
index 9d0b697f..2ec1d6cd 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
@@ -25,8 +25,8 @@ ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
 ESW_COMPONENT_NAME = "libxil.a"
 
 DEPENDS += "xilstandalone "
-REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES}"
-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}
@@ -37,7 +37,7 @@ do_compile() {
    # Combines the .a archives produced by all of the dependent items
    cd ${RECIPE_SYSROOT}/usr/lib/
    echo create libxil.a > libxil.mri
-   for each in ${REQUIRED_DISTRO_FEATURES}; do
+   for each in ${REQUIRED_MACHINE_FEATURES}; do
      each=$(echo $each | sed 's/-/_/g')
      if [ -e lib$each.a ]; then
        echo addlib lib$each.a >> libxil.mri
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 213187e1..93f0b1e8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -1,17 +1,17 @@
 inherit esw python3native
 
-ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/"
-ESW_COMPONENT_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 += "-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 += "-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
@@ -30,5 +30,5 @@ do_install() {
     install -m 0644  ${B}/include/*.h ${D}${includedir}
     cp -r ${B}/include/arch/ ${D}${includedir}
     cp -r ${B}/include/include/lwip/ ${D}${includedir}
-    cp -r ${B}/include/include/netif/ ${D}${includedir}
+    cp -r ${B}/include/netif/ ${D}${includedir}
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
index bb976377..cae39d17 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
@@ -1,7 +1,7 @@
 inherit esw deploy
 
 # Requires by dependency xilffs
-REQUIRED_DISTRO_FEATURES = "sdps"
+REQUIRED_MACHINE_FEATURES = "sdps"
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/examples/"
 
@@ -11,7 +11,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
index 2a01c974..298e3033 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_git.bb
@@ -1,7 +1,5 @@
 inherit esw features_check
 
-REQUIRED_DISTRO_FEATURES = "sdps"
-
 ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
 ESW_COMPONENT_NAME = "libxilffs.a"
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
index df5c1bbe..a3fb1560 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
index 1e457d18..600369ad 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
index 50dbc776..77115515 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb
@@ -4,3 +4,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/src/"
 ESW_COMPONENT_NAME = "libxilmailbox.a"
 
 DEPENDS += "xilstandalone libxil xiltimer"
+
+do_configure:prepend() {
+    # This script should also not rely on relative paths and such
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
index a656e7ec..a4a81c8b 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
index f58538cd..69b505c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpm_git.bb
@@ -1,6 +1,15 @@
-inherit esw
+inherit esw python3native
 
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/"
 ESW_COMPONENT_NAME = "libxilpm.a"
 
-DEPENDS = "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else ''}"
+DEPENDS += "libxil ${@'xilplmi cframe' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
+
+do_configure:prepend:zynqmp() {
+    # This script should also not rely on relative paths and such
+    (
+        cd ${S}
+        lopper -f --enhanced --werror ${DTS_FILE} -- generate_config_object pm_cfg_obj.c ${ESW_MACHINE}
+        install -m 0755 pm_cfg_obj.c ${S}/${ESW_COMPONENT_SRC}/zynqmp/client/common/
+    )
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
index ad2d5c47..ca0abc12 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
index 266503d1..81bee095 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf_git.bb
@@ -3,4 +3,4 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/src/"
 ESW_COMPONENT_NAME = "libxilpuf.a"
 
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else 'xilmailbox'}"
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else 'xilmailbox'}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
index 2267571f..993794b5 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
@@ -8,7 +8,6 @@ do_configure:prepend() {
     (
     cd ${S}
     lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
-    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
     install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
     )
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
index b8e2aa16..0001d3fb 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb
@@ -3,4 +3,4 @@ inherit esw
 ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
 ESW_COMPONENT_NAME = "libxilsecure.a"
 
-DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'microblaze-plm' else 'xilmailbox'}"
+DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''} ${@'xilmailbox' if d.getVar('ESW_MACHINE') == 'psv_cortexa72_0' or d.getVar('ESW_MACHINE') == 'psv_cortexr5_0' else ''}"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
index 70a46c5e..facbfbaa 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
@@ -11,6 +11,8 @@ do_configure:prepend() {
     cd ${S}
     lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
     install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/
-    install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}/common/
+    install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}
+    lopper ${DTS_FILE} -- bmcmake_metadata_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
+    install -m 0755 StandaloneExample.cmake ${S}/${ESW_COMPONENT_SRC}/common/
     )
 }