zynqmp-pmu-config.inc: Restrict BPNs further

Restrict binutils and gcc to their -cross variant only. This prevents
world targets from selecting zynqmp-pmu-gcc/binutils which require more
dependencies.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/conf/machine/include/zynqmp-pmu-config.inc b/conf/machine/include/zynqmp-pmu-config.inc
index ffe2cf43..23d9ade1 100644
--- a/conf/machine/include/zynqmp-pmu-config.inc
+++ b/conf/machine/include/zynqmp-pmu-config.inc
@@ -1,15 +1,16 @@
 
 # Enable the use of zynqmp-pmu for specific recipes only
 def zynqmp_pmu_enable_for_bpns(d):
-    bpns = [
-        "binutils",
-        "gcc", "libgcc",
-        "newlib", "libgloss",
-        "pmu-firmware",
-        ]
-    return " zynqmp-pmu" if (d.getVar("BPN") in bpns) else ""
+    bpn = d.getVar("BPN")
+    crossbpns = ["binutils", "gcc"]
+    targetbpns = ["libgcc", "newlib", "libgloss", "pmu-firmware"]
+    if bpn in targetbpns:
+        return True
+    if bpn in crossbpns and bb.data.inherits_class('cross', d):
+        return True
+    return False
 
-BBCLASSEXTEND_append = "${@zynqmp_pmu_enable_for_bpns(d)}"
+BBCLASSEXTEND_append = "${@' zynqmp-pmu' if zynqmp_pmu_enable_for_bpns(d) else ''}"
 
 # Add the pkgarch to the extra list, this is done to avoid warnings about
 # missing manifests due to implicit dependency chains on populate_sysroot when