From f06c7da5e810168398685d9b4d7d0ae14d291a87 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 29 Jul 2021 17:30:58 -0500 Subject: [PATCH] jailhouse: Drop from MACHINE_FEATURES_BACKFILL The backfill feature is for features that were once always enabled without the ability to disable them. This is not true of jailhouse; it has always had a feature allowing it to be disabled. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 5 +---- conf/machine/include/imx8mm-evk.inc | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 2a09a08b..417fd17b 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 @@ -477,9 +477,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 62d5bfdd..82384ac6 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 driver and firmware +# NXP BSP can consume proprietary jailhouse and BCM4359 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" +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ -- 2.40.1