diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2017-08-21 18:51:53 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-08-27 19:13:52 +1000 |
commit | 7cc7bede17d65c496509c3d10b3ff0964d29c16f (patch) | |
tree | 0e3e072d388752ef19df793200cc299482a1b595 /classes | |
parent | a2a744c5e20b9c624c15db8bae9793ea218264cf (diff) | |
download | meta-xilinx-7cc7bede17d65c496509c3d10b3ff0964d29c16f.tar.gz |
zynqmp-pmu.bbclass: Fix issues with zynqmp-pmu and multilib
When using multilib the MULTILIB_VARIANTS variable is populated, this
triggers differing code paths in certain recipes. These are not desired
for the firmware building, since they modify the install paths.
Also set the DEFAULTTUNE to avoid changes to BASELIB/baselib when
multilib is used, as it attempts to set BASELIB based on 'tune-*'
overrides.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Tested-by: Alistair Francis <alistair.francis@xilinx.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/zynqmp-pmu.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/classes/zynqmp-pmu.bbclass b/classes/zynqmp-pmu.bbclass index 3ebe4881..714eb96a 100644 --- a/classes/zynqmp-pmu.bbclass +++ b/classes/zynqmp-pmu.bbclass | |||
@@ -16,6 +16,7 @@ | |||
16 | ORIG_TARGET_ARCH := "${TARGET_ARCH}" | 16 | ORIG_TARGET_ARCH := "${TARGET_ARCH}" |
17 | 17 | ||
18 | # zynqmp-pmu target arch (hardcoded based on pre-gen data from arch-microblaze.inc) | 18 | # zynqmp-pmu target arch (hardcoded based on pre-gen data from arch-microblaze.inc) |
19 | DEFAULTTUNE = "microblaze" | ||
19 | ABIEXTENSION = "" | 20 | ABIEXTENSION = "" |
20 | TUNE_ARCH = "microblazeel" | 21 | TUNE_ARCH = "microblazeel" |
21 | #TUNE_FEATURES_tune-microblaze += "v9.2 barrel-shift pattern-compare" | 22 | #TUNE_FEATURES_tune-microblaze += "v9.2 barrel-shift pattern-compare" |
@@ -65,6 +66,9 @@ python multitarget_zynqmp_pmu_virtclass_handler () { | |||
65 | e.data.setVar("MLPREFIX", variant + "-") | 66 | e.data.setVar("MLPREFIX", variant + "-") |
66 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-" + variant) | 67 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-" + variant) |
67 | 68 | ||
69 | # hide multilib variants, this class is not one but this works around recipes thinking it is (due to MLPREFIX). | ||
70 | e.data.setVar("MULTILIB_VARIANTS", "") | ||
71 | |||
68 | # work around for -cross recipes that embed the TARGET_ARCH value | 72 | # work around for -cross recipes that embed the TARGET_ARCH value |
69 | if bb.data.inherits_class('cross', e.data): | 73 | if bb.data.inherits_class('cross', e.data): |
70 | if initialpn.endswith("-" + d.getVar("ORIG_TARGET_ARCH")): | 74 | if initialpn.endswith("-" + d.getVar("ORIG_TARGET_ARCH")): |