Merge pull request #1541 from JohannesKauffmann/backport-1540-to-kirkstone

Add screen machine feature to all machine configurations

3 files changed, 1 insertions, 5 deletions

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 5e8be1e9..64e0411a 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -19,5 +19,3 @@ UBOOT_SUFFIX = "sb"
 UBOOT_MACHINE = "mx23evk_config"
 
 KERNEL_DEVICETREE = "imx23-evk.dtb"
-
-MACHINE_FEATURES = "usbgadget usbhost vfat touchscreen"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 9763a396..99ed29a9 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -25,8 +25,6 @@ KERNEL_DEVICETREE = "imx28-evk.dtb"
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
-MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
-
 ## Parameters for NAND IC part-# K9LBG08U0D-PCB0
 
 MKUBIFS_ARGS = "--min-io-size 4096 --leb-size 516096 --max-leb-cnt 8139"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 103a0d78..e34f8161 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -600,7 +600,7 @@ SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0"
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_IMAGETYPE:aarch64 = "Image"
 
-MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen screen"
 
 HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum"