diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2021-07-29 17:30:58 -0500 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2021-09-13 15:48:58 -0300 |
commit | f06c7da5e810168398685d9b4d7d0ae14d291a87 (patch) | |
tree | 1b1e367f66d03a95e5bc2f0fbaf5fae17b4c43a8 | |
parent | 866feecf626e88df08f2d1f01337cb703a22af3d (diff) | |
download | meta-freescale-f06c7da5e810168398685d9b4d7d0ae14d291a87.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.inc | 5 | ||||
-rw-r--r-- | 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" | |||
315 | 315 | ||
316 | # Jailhouse | 316 | # Jailhouse |
317 | MACHINE_EXTRA_RRECOMMENDS += " \ | 317 | MACHINE_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 |
@@ -477,9 +477,6 @@ KERNEL_IMAGETYPE_aarch64 = "Image" | |||
477 | 477 | ||
478 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" | 478 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" |
479 | 479 | ||
480 | SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse" | ||
481 | MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}" | ||
482 | |||
483 | # Add the ability to specify _imx machines | 480 | # Add the ability to specify _imx machines |
484 | MACHINEOVERRIDES =. "imx:" | 481 | MACHINEOVERRIDES =. "imx:" |
485 | 482 | ||
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 | |||
5 | 5 | ||
6 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" | 6 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" |
7 | 7 | ||
8 | # NXP BSP can consume BCM4359 driver and firmware | 8 | # NXP BSP can consume proprietary jailhouse and BCM4359 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. |
14 | MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359" | 14 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" |
15 | 15 | ||
16 | KERNEL_DEVICETREE = " \ | 16 | KERNEL_DEVICETREE = " \ |
17 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | 17 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ |