summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2023-02-24 10:12:19 +0000
committerRyan Eatmon <reatmon@ti.com>2023-02-24 08:38:07 -0600
commit696c7d090d85d9526955cedd4e4184e599a09740 (patch)
treeb41139725fbb15f5c6764cac09bbb038796cff6e
parentd859c8c0916c8eb4b88ca8e0db7f9e5a846ba869 (diff)
downloadmeta-ti-696c7d090d85d9526955cedd4e4184e599a09740.tar.gz
conf/machine: fix use of screen and touchscreen machine features
Some machine configs didn't specify their use of screen and touchscreen machine features correctly, fix them. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/am64xx.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/j721e.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/j721s2.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/j784s4.inc2
5 files changed, 4 insertions, 6 deletions
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 2a06fc0f..98df24b2 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am62xx" 2SOC_FAMILY:append = ":am62xx"
3 3
4MACHINE_FEATURES += "screen touchscreen gpu" 4MACHINE_FEATURES += "screen gpu"
5 5
6SERIAL_CONSOLES = "115200;ttyS2" 6SERIAL_CONSOLES = "115200;ttyS2"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 0fd15b90..a2e5d673 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -1,8 +1,6 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am64xx" 2SOC_FAMILY:append = ":am64xx"
3 3
4MACHINE_FEATURES += "screen touchscreen"
5
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" 4SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 5SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8 6
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 74cdc0e7..8f9c24e6 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j721e" 2SOC_FAMILY:append = ":j721e"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "screen gpu"
5 5
6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
7 7
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index b0953c1a..70569a16 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j721s2" 2SOC_FAMILY:append = ":j721s2"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "screen gpu"
5 5
6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
7 7
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index 48d20a21..d03ee4a4 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j784s4" 2SOC_FAMILY:append = ":j784s4"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "screen gpu"
5 5
6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
7 7