Merge pull request #836 from thochstein/jailhouse

Jailhouse enablement rework

3 files changed, 6 insertions, 8 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 65b1e6e0..f92a08af 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -315,7 +315,7 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 
 # Jailhouse
 MACHINE_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \
+    ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
 "
 
 # GStreamer 1.0 plugins
@@ -474,9 +474,6 @@ KERNEL_IMAGETYPE_aarch64 = "Image"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
-SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse"
-MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}"
-
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
 
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index bcf838ab..f458c56d 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -5,13 +5,13 @@ require conf/machine/include/tune-cortexa53.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
 
-# NXP BSP can consume BCM4359 and QCA9377 driver and firmware
+# NXP BSP can consume proprietary jailhouse, BCM4359, and QCA9377 driver and firmware
 # Since the firmware is not available publicly, and rather distributed
 # under "Proprietary" license - we opt-out from using it in all BSPs
 # and pin it to NXP BSP only
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359 qca9377"
+MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359 qca9377"
 
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 814638d0..d070831f 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -3,11 +3,12 @@ MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-MACHINE_FEATURES += "pci wifi bluetooth jailhouse"
+MACHINE_FEATURES += "pci wifi bluetooth"
 
+# NXP BSP can consume proprietary jailhouse and Marvell drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee mrvl8997"
+MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse mrvl8997"
 
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine