Merge remote-tracking branch 'origin/rel-v2023.2' into nanbield

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

1 files changed, 8 insertions, 4 deletions

diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index 6a88d757..daa73f2a 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: ultra96-zynqmp
 #@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "ultra96:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'ultra96-zynqmp:']['ultra96-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
@@ -51,6 +47,10 @@ require conf/machine/zynqmp-eg-generic.conf
 # from local.conf.
 HDF_MACHINE = "ultra96-zynqmp"
 
+# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match
+# the xsa. User can enable explicitly if required from local.conf.
+# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
+
 # Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G,
 # Hence set QB_MEM to 2GB.
 QB_MEM = "-m 2G"
@@ -71,3 +71,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
     linux-firmware-wl18xx \
     linux-firmware-ti-bt-wl180x \
     "
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ultra96_zynqmp']['ultra96-zynqmp' != '${MACHINE}']}"