qemu-xilinx-system-native: Move pmu-rom enablement to recipe

Setting the pmu-rom being required by QEMU within the machine.conf will cause
the recipe's hash to change, which can cause a ripple effect causing other
things to rebuild.  Moving this to the recipe, and switching it on based
on what licenses the user allows will avoid this conflict.

Additionally add a warning message to the xilinx-vars.bbclass if the user has
not enabled the license.

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

3 files changed, 8 insertions, 3 deletions

diff --git a/meta-xilinx-core/classes/xilinx-vars.bbclass b/meta-xilinx-core/classes/xilinx-vars.bbclass
index a1a0e38c..51d3cd87 100644
--- a/meta-xilinx-core/classes/xilinx-vars.bbclass
+++ b/meta-xilinx-core/classes/xilinx-vars.bbclass
@@ -23,4 +23,10 @@ python xilinx_variables_config_eventhandler () {
         bb.fatal("The loaded DEFAULTTUNE is %s, but it appears you intended %s. " \
                  "This is usually as a result of specifying it after the 'require' in the machine .conf file. " \
                  "See meta-xilinx-core/conf/machine/README." % (tune_prior, tune_final))
+
+    # Verify 'xilinx' is in LICENSE_FLAGS_ACCEPTED
+    license_flags = d.getVar('LICENSE_FLAGS_ACCEPTED') or ""
+    if 'xilinx' not in license_flags.split():
+        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.")
 }
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 1ca25862..6c01548f 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -60,9 +60,6 @@ HDF_MACHINE = "zcu102-zynqmp"
 # Basic features:
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth"
 
-# Qemu Xilinx Native when targeting ZynqMP generic requires the pmu rom
-DEPENDS:append:pn-qemu-xilinx-native = " pmu-rom-native"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
new file mode 100644
index 00000000..0444dbab
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
@@ -0,0 +1,2 @@
+# Automatically enable pmu-rom-native for ZynqMP support, or warn the user
+DEPENDS .= "${@' pmu-rom-native' if 'xilinx' in d.getVar('LICENSE_FLAGS_ACCEPTED').split() else ''}"