1 files changed, 1 insertions, 10 deletions

diff --git a/meta-xilinx-core/classes/xilinx-vars.bbclass b/meta-xilinx-core/classes/xilinx-vars.bbclass
index 51d3cd87..e19918ca 100644
--- a/meta-xilinx-core/classes/xilinx-vars.bbclass
+++ b/meta-xilinx-core/classes/xilinx-vars.bbclass
@@ -6,15 +6,6 @@ xilinx_variables_config_eventhandler[eventmask] = "bb.event.ConfigParsed"
 # It's up to the base sytem to define the variables being used here, we're
 # only going to check them.
 python xilinx_variables_config_eventhandler () {
-    # Verify HDF_MACHINE
-    hdf_prior = d.getVar('HDF_MACHINE_PRIOR')
-    hdf_final = d.getVar('HDF_MACHINE')
-
-    if hdf_prior and hdf_prior != hdf_final:
-        bb.fatal("HDF_MACHINE is set to %s, it appears you intended %s. " \
-                 "This is usually as a result of specifying it in the local.conf or before the 'require' in the machine .conf file. " \
-                 "See meta-xilinx-core/conf/machine/README." % (hdf_final, hdf_prior))
-
     # Verify DEFAULTTUNE
     tune_prior = d.getVar('DEFAULTTUNE_PRIOR')
     tune_final = d.getVar('DEFAULTTUNE')
@@ -26,7 +17,7 @@ python xilinx_variables_config_eventhandler () {
 
     # Verify 'xilinx' is in LICENSE_FLAGS_ACCEPTED
     license_flags = d.getVar('LICENSE_FLAGS_ACCEPTED') or ""
-    if 'xilinx' not in license_flags.split():
+    if all(license not in license_flags.split() for license in ['xilinx', 'xilinx_pmu-rom-native']) :
         bb.warn("The ZynqMP pmu-rom is not enabled, qemu may not be able to emulate a ZynqMP system without it. " \
                 "To enable this you must add 'xilinx' to the LICENSE_FLAGS_ACCEPTED to indicate you accept the software license.")
 }