1 files changed, 6 insertions, 1 deletions

diff --git a/meta-xilinx-core/classes/xilinx-deprecated.bbclass b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
index 1aee2fe1..788b963e 100644
--- a/meta-xilinx-core/classes/xilinx-deprecated.bbclass
+++ b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
@@ -9,10 +9,15 @@ python xilinx_deprecated_config_eventhandler () {
     if d.getVar('BOARD') or d.getVar('BOARD_VARIANT'):
         bb.error("Deprecated BOARD (%s) or BOARD_VARIANT (%s) is being used, they are no longer supported and are ignored." % (d.getVar('BOARD'), d.getVar('BOARD_VARIANT')))
 
+    # Check for 'generic' machines, warn the user this isn't what they want
+    if d.getVar('MACHINE').endswith('-generic'):
+        bb.warn('The %s machine is intended to be included by other machines, it should not be used by itself.  For a non-machine, SoC specific filesystem, please use one of the common machines defined in meta-xilinx-core.' % d.getVar('MACHINE'))
+
     msg_list = d.getVarFlags('XILINX_DEPRECATED') or []
     for msg_source in msg_list:
         if msg_source == "doc":
             continue
         msg = d.getVarFlag('XILINX_DEPRECATED', msg_source) or ""
-        bb.warn('%s: %s' % (msg_source, msg))
+        if msg:
+            bb.warn('%s: %s' % (msg_source, msg))
 }