From 99935ce71bda80b8013febf54e94055c92d10eb1 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Fri, 7 Aug 2020 02:51:56 +0000
Subject: [PATCH] conf/machine: clean up MACHINE_FEATURES for k3/j7/am65
 families

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 conf/machine/include/am65xx.inc | 2 +-
 conf/machine/include/k3.inc     | 3 +--
 conf/machine/j7-evm.conf        | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index f60d1662..1acb205b 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY_append = ":am65xx"
 
-MACHINE_FEATURES += "touchscreen"
+MACHINE_FEATURES += "screen touchscreen gpu"
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index 6b78f4ca..c727d724 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -36,8 +36,7 @@ MACHINE_GUI_CLASS = "smallscreen"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu"
-# Not ready yet - dsp mmip
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz"
 
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
index aedfc825..ee23207b 100644
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -4,6 +4,8 @@
 
 require conf/machine/include/j7.inc
 
+MACHINE_FEATURES += "gpu"
+
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"