diff options
author | Denys Dmytriyenko <denys@ti.com> | 2020-08-07 02:51:56 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2020-08-06 20:55:36 +0000 |
commit | 5e12310bfcc2a840e2524a2b0fa64efcc7d24e42 (patch) | |
tree | 4181910772ea209ee703123324687b0b417b6a84 /conf | |
parent | 9a75ee4f4c1a2f81d27dfdf539fcb1a0820c2132 (diff) | |
download | meta-ti-5e12310bfcc2a840e2524a2b0fa64efcc7d24e42.tar.gz |
conf/machine: clean up MACHINE_FEATURES for k3/j7/am65 families
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/am65xx.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/k3.inc | 3 | ||||
-rw-r--r-- | 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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY_append = ":am65xx" | 2 | SOC_FAMILY_append = ":am65xx" |
3 | 3 | ||
4 | MACHINE_FEATURES += "touchscreen" | 4 | MACHINE_FEATURES += "screen touchscreen gpu" |
5 | 5 | ||
6 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" | 6 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" |
7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 7 | 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" | |||
36 | UBI_VOLNAME = "rootfs" | 36 | UBI_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 |
39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" | 39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" |
40 | # Not ready yet - dsp mmip | ||
41 | 40 | ||
42 | IMAGE_FSTYPES += "tar.xz wic.xz" | 41 | IMAGE_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 | ||
5 | require conf/machine/include/j7.inc | 5 | require conf/machine/include/j7.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "gpu" | ||
8 | |||
7 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" | 9 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" |
8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
9 | 11 | ||