From 780cf7f53ca2afc96cca61b7852abcad043ccca1 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Tue, 10 Mar 2020 10:29:03 -0700
Subject: machine-xilinx-overrides: Make this generic

Move the soc specific contents into the soc configuration file.

Adjust the PACKAGE_EXTRA_ARCHS append to a more generic method for setting
the SOC_FAMILY and SOC_VARIANT package arch.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 .../machine/include/machine-xilinx-overrides.inc    | 21 ++++-----------------
 meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc |  3 +++
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc
index 30049bc0..32bc97e4 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc
@@ -1,21 +1,8 @@
 SOC_VARIANT ??= ""
 MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
 
-# Here we can extend overrides for the corresponding family and variant
-def get_soc_overrides(fam, var, d):
-  extender = ''
-  if (fam == 'zynqmp'):
-    if (var == 'eg'):
-      extender = 'mali400:'
-    elif (var == 'ev'):
-      extender = 'mali400:vcu:'
-  return extender
-
-# Gets OVERRIDES extender depending on the board
-SOC_OVERRIDES = "${@get_soc_overrides(d.getVar('SOC_FAMILY'),d.getVar('SOC_VARIANT'), d)}"
-
-MACHINEOVERRIDES  =. "${SOC_OVERRIDES}"
-
-PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_FAMILY}${SOC_VARIANT}']['${SOC_VARIANT}' != '']}"
+SOC_FAMILY_ARCH ?= "${SOC_FAMILY}"
+SOC_VARIANT_ARCH ?= "${SOC_FAMILY}${SOC_VARIANT}"
 
+PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index 1ed53ebb..0e4659fc 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
@@ -9,6 +9,9 @@ SOC_FAMILY ?= "zynqmp"
 
 SOC_VARIANT ?= "eg"
 
+MACHINEOVERRIDES_prepend_zynqmpeg = "mali400:"
+MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:"
+
 require conf/machine/include/tune-cortexa72-cortexa53.inc
 require conf/machine/include/soc-family.inc
 
-- 
cgit v1.2.3-54-g00ecf