summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2021-07-29 17:30:58 -0500
committerTom Hochstein <tom.hochstein@nxp.com>2021-07-29 17:30:58 -0500
commit9ddb7f820ba5dab5eb0a5f674d73114dcfee58f7 (patch)
treefec573522bbc9b0eb8f08ce870bcf8a15588f8ce
parent6adcab4f177fd132fd08d87cbe296ec21330b2c9 (diff)
downloadmeta-freescale-9ddb7f820ba5dab5eb0a5f674d73114dcfee58f7.tar.gz
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 <tom.hochstein@nxp.com>
-rw-r--r--conf/machine/include/imx-base.inc5
-rw-r--r--conf/machine/include/imx8mm-evk.inc4
2 files changed, 3 insertions, 6 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"
315 315
316# Jailhouse 316# Jailhouse
317MACHINE_EXTRA_RRECOMMENDS += " \ 317MACHINE_EXTRA_RRECOMMENDS += " \
318 ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ 318 ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
319" 319"
320 320
321# GStreamer 1.0 plugins 321# GStreamer 1.0 plugins
@@ -474,9 +474,6 @@ KERNEL_IMAGETYPE_aarch64 = "Image"
474 474
475MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 475MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
476 476
477SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse"
478MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}"
479
480# Add the ability to specify _imx machines 477# Add the ability to specify _imx machines
481MACHINEOVERRIDES =. "imx:" 478MACHINEOVERRIDES =. "imx:"
482 479
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
5 5
6MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" 6MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
7 7
8# NXP BSP can consume BCM4359 and QCA9377 driver and firmware 8# NXP BSP can consume proprietary jailhouse, BCM4359, and QCA9377 driver and firmware
9# Since the firmware is not available publicly, and rather distributed 9# Since the firmware is not available publicly, and rather distributed
10# under "Proprietary" license - we opt-out from using it in all BSPs 10# under "Proprietary" license - we opt-out from using it in all BSPs
11# and pin it to NXP BSP only 11# and pin it to NXP BSP only
12# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 12# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
13# a full support for it yet. 13# a full support for it yet.
14MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359 qca9377" 14MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359 qca9377"
15 15
16KERNEL_DEVICETREE = " \ 16KERNEL_DEVICETREE = " \
17 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 17 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \