From ebc0e89b65a1d518e53f175a3af4af10dfc94607 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Wed, 21 Jun 2023 18:02:40 -0600 Subject: ultra96-zynqmp: Remove BOARD overrides Using BOARD variable are deprecated, hence remove it. ultra96-zynqmp.conf file using BOARD overrides now will be replaced with machineoverrides. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf index 479398b0..711c3ec6 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" -- cgit v1.2.3-54-g00ecf