From 3d6d18a72997a80665b3a8d3572e98a71cadb41d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 26 Oct 2022 16:43:11 -0700 Subject: soc-zynqmp.inc: Reorder the mali400 and vcu machineoverrides We need the mali400 and vcu overrides to override the SOC and SOC_FAMILY overrides. So adjust the order so they are higher priority, just under the machine name itself. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core/conf/machine') diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc index 8b49aa37..0ae23b01 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc @@ -9,8 +9,6 @@ SOC_FAMILY ?= "zynqmp" SOC_VARIANT ?= "eg" -require xilinx-soc-family.inc - GRAPHICSOVERRIDES = "" VCUOVERRIDES = "" @@ -22,6 +20,8 @@ VCUOVERRIDES:zynqmp-ev = "vcu:" MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}${VCUOVERRIDES}" +require xilinx-soc-family.inc + require soc-tune-include.inc # Linux Configuration -- cgit v1.2.3-54-g00ecf