From 696c7d090d85d9526955cedd4e4184e599a09740 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 24 Feb 2023 10:12:19 +0000 Subject: 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 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am64xx.inc | 2 -- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j721s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-ti-bsp/conf') 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 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen gpu" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_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 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am64xx" -MACHINE_FEATURES += "screen touchscreen" - SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 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 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721e" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 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 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 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 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j784s4" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -- cgit v1.2.3-54-g00ecf