diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2020-03-10 10:29:03 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2020-03-13 09:43:43 -0700 |
commit | 780cf7f53ca2afc96cca61b7852abcad043ccca1 (patch) | |
tree | 084e097b27dece381dd6a9ce60aff77764201ce0 /meta-xilinx-bsp/conf | |
parent | da096d787519e4b998f8a8837b60fdb5f45e7ce7 (diff) | |
download | meta-xilinx-780cf7f53ca2afc96cca61b7852abcad043ccca1.tar.gz |
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>
Diffstat (limited to 'meta-xilinx-bsp/conf')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc | 21 | ||||
-rw-r--r-- | 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 @@ | |||
1 | SOC_VARIANT ??= "" | 1 | SOC_VARIANT ??= "" |
2 | MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}" | 2 | MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}" |
3 | 3 | ||
4 | # Here we can extend overrides for the corresponding family and variant | 4 | SOC_FAMILY_ARCH ?= "${SOC_FAMILY}" |
5 | def get_soc_overrides(fam, var, d): | 5 | SOC_VARIANT_ARCH ?= "${SOC_FAMILY}${SOC_VARIANT}" |
6 | extender = '' | ||
7 | if (fam == 'zynqmp'): | ||
8 | if (var == 'eg'): | ||
9 | extender = 'mali400:' | ||
10 | elif (var == 'ev'): | ||
11 | extender = 'mali400:vcu:' | ||
12 | return extender | ||
13 | |||
14 | # Gets OVERRIDES extender depending on the board | ||
15 | SOC_OVERRIDES = "${@get_soc_overrides(d.getVar('SOC_FAMILY'),d.getVar('SOC_VARIANT'), d)}" | ||
16 | |||
17 | MACHINEOVERRIDES =. "${SOC_OVERRIDES}" | ||
18 | |||
19 | PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY}" | ||
20 | PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_FAMILY}${SOC_VARIANT}']['${SOC_VARIANT}' != '']}" | ||
21 | 6 | ||
7 | PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY_ARCH}" | ||
8 | 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" | |||
9 | 9 | ||
10 | SOC_VARIANT ?= "eg" | 10 | SOC_VARIANT ?= "eg" |
11 | 11 | ||
12 | MACHINEOVERRIDES_prepend_zynqmpeg = "mali400:" | ||
13 | MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:" | ||
14 | |||
12 | require conf/machine/include/tune-cortexa72-cortexa53.inc | 15 | require conf/machine/include/tune-cortexa72-cortexa53.inc |
13 | require conf/machine/include/soc-family.inc | 16 | require conf/machine/include/soc-family.inc |
14 | 17 | ||