summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2020-08-07 02:51:56 +0000
committerDenys Dmytriyenko <denys@ti.com>2020-08-06 20:55:36 +0000
commit5e12310bfcc2a840e2524a2b0fa64efcc7d24e42 (patch)
tree4181910772ea209ee703123324687b0b417b6a84
parent9a75ee4f4c1a2f81d27dfdf539fcb1a0820c2132 (diff)
downloadmeta-ti-5e12310bfcc2a840e2524a2b0fa64efcc7d24e42.tar.gz
conf/machine: clean up MACHINE_FEATURES for k3/j7/am65 families
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--conf/machine/include/am65xx.inc2
-rw-r--r--conf/machine/include/k3.inc3
-rw-r--r--conf/machine/j7-evm.conf2
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 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY_append = ":am65xx" 2SOC_FAMILY_append = ":am65xx"
3 3
4MACHINE_FEATURES += "touchscreen" 4MACHINE_FEATURES += "screen touchscreen gpu"
5 5
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" 6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 7SERIAL_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"
36UBI_VOLNAME = "rootfs" 36UBI_VOLNAME = "rootfs"
37 37
38# List common SoC features, may need to add touchscreen for specific machines 38# List common SoC features, may need to add touchscreen for specific machines
39MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" 39MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
40# Not ready yet - dsp mmip
41 40
42IMAGE_FSTYPES += "tar.xz wic.xz" 41IMAGE_FSTYPES += "tar.xz wic.xz"
43 42
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 @@
4 4
5require conf/machine/include/j7.inc 5require conf/machine/include/j7.inc
6 6
7MACHINE_FEATURES += "gpu"
8
7SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" 9SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
8SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 10SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
9 11