xilinx-microblaze.bbclass: Fail if meta-microblaze is not included

When the user uses a microblaze tune, we need to check if meta-microblaze is
part of their build.  If not stop, and tell them they need to add it.

meta-microblaze is not a layers dependency as it is not needed for most
builds.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 11 insertions, 16 deletions

diff --git a/meta-xilinx-core/classes/xilinx-microblaze.bbclass b/meta-xilinx-core/classes/xilinx-microblaze.bbclass
new file mode 100644
index 00000000..ed231a3a
--- /dev/null
+++ b/meta-xilinx-core/classes/xilinx-microblaze.bbclass
@@ -0,0 +1,11 @@
+# Class to add a deprecated warning from various configuration files.
+
+# Immediately after the ConfigParsed event handler, warn the user of any
+# deprecated files the user has used.
+addhandler xilinx_microblaze_config_eventhandler
+xilinx_microblaze_config_eventhandler[eventmask] = "bb.event.ConfigParsed"
+python xilinx_microblaze_config_eventhandler () {
+    if d.getVar('DEFAULTTUNE').startswith('microblaze'):
+        if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split():
+            bb.fatal('You must include the meta-microblaze layer to build for this configuration.')
+}
diff --git a/meta-xilinx-core/classes/xlnx-standalone.bbclass b/meta-xilinx-core/classes/xlnx-standalone.bbclass
deleted file mode 100644
index 9232b1ef..00000000
--- a/meta-xilinx-core/classes/xlnx-standalone.bbclass
+++ /dev/null
@@ -1,16 +0,0 @@
-# Only enabled when ilp32 is enabled.
-def xlnx_ilp32_dict(machdata, d):
-    machdata["elf"] = {
-                        "aarch64" :   (183,    0,    0,          True,          32),
-                        "aarch64_be" :(183,    0,    0,          False,         32),
-                      }
-    return machdata
-
-# Only enabled when microblaze64 is enabled.
-def xlnx_mb64_dict(machdata, d):
-    machdata["elf"] = {
-                        "microblaze":  (189,   0,    0,          False,         64),
-                        "microblazeeb":(189,   0,    0,          False,         64),
-                        "microblazeel":(189,   0,    0,          True,          64),
-                      }
-    return machdata