diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-12-09 13:24:13 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-12-16 10:18:32 -0800 |
commit | 476d4c7f5f7fabe3e87faf9b8a74fbd96f2cf2fb (patch) | |
tree | d736e69b63bbf2812b73c458dff1d7e5561b2093 | |
parent | f9154e30c19c0a598b09100ff07ac74ba0888856 (diff) | |
download | meta-xilinx-476d4c7f5f7fabe3e87faf9b8a74fbd96f2cf2fb.tar.gz |
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>
-rw-r--r-- | meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 11 |
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" | |||
9 | 9 | ||
10 | SOC_VARIANT ?= "cg" | 10 | SOC_VARIANT ?= "cg" |
11 | 11 | ||
12 | # Add VCU feature on "ev" devices | ||
13 | VCU_MACHINE_FEATURE = "" | ||
14 | VCU_MACHINE_FEATURE:zynqmp-ev = " vcu" | ||
15 | MACHINE_FEATURES .= "${VCU_MACHINE_FEATURE}" | ||
16 | |||
12 | GRAPHICSOVERRIDES = "" | 17 | GRAPHICSOVERRIDES = "" |
13 | VCUOVERRIDES = "" | ||
14 | 18 | ||
15 | # Mali400: override is only used with the ARM mali driver, not the lima driver | 19 | # Mali400: override is only used with the ARM mali driver, not the lima driver |
16 | GRAPHICSOVERRIDES = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', 'mali400:', '', d)}" | 20 | GRAPHICSOVERRIDES = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', 'mali400:', '', d)}" |
17 | 21 | ||
18 | # VCUOVERRIDE is only for use with the VCU | 22 | MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}" |
19 | VCUOVERRIDES:zynqmp-ev = "vcu:" | ||
20 | |||
21 | MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}${VCUOVERRIDES}" | ||
22 | 23 | ||
23 | require xilinx-soc-family.inc | 24 | require xilinx-soc-family.inc |
24 | 25 | ||