soc-zynqmp: Move from vcu override to MACHINE_FEATURES

The override was not being used anywhere, this was just acting as a potential
tigger for recipes.  Instead, we define the MACHINE_FEATURES vcu and will
use that to determine if VCU functionality is enabled.

By default the zynqmp-ev has VCU feature present.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
index bdb72194..5331c17a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
@@ -9,16 +9,17 @@ SOC_FAMILY ?= "zynqmp"
 
 SOC_VARIANT ?= "cg"
 
+# Add VCU feature on "ev" devices
+VCU_MACHINE_FEATURE = ""
+VCU_MACHINE_FEATURE:zynqmp-ev = " vcu"
+MACHINE_FEATURES .= "${VCU_MACHINE_FEATURE}"
+
 GRAPHICSOVERRIDES = ""
-VCUOVERRIDES = ""
 
 # Mali400: override is only used with the ARM mali driver, not the lima driver
 GRAPHICSOVERRIDES = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', 'mali400:', '', d)}"
 
-# VCUOVERRIDE is only for use with the VCU
-VCUOVERRIDES:zynqmp-ev = "vcu:"
-
-MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}${VCUOVERRIDES}"
+MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}"
 
 require xilinx-soc-family.inc