diff mbox series

[master,4/5] conf/machine: remove default setting for xorg

Message ID 20220505174422.334666-4-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master,1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config | expand

Commit Message

Denys Dmytriyenko May 5, 2022, 5:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

meta-ti does not provide official X.org support, so no reason to set any
defaults, just assume the ones from OE-Core.

Also, drop setting MACHINE_GUI_CLASS, which is now only used by the kernel
from meta-openembedded to determine the size of the Tux during boot. Keep
those for now in community Beagle machines.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/am335x-evm.conf      |  1 -
 meta-ti-bsp/conf/machine/am437x-evm.conf      |  1 -
 meta-ti-bsp/conf/machine/include/k3.inc       |  2 --
 meta-ti-bsp/conf/machine/include/omap-a15.inc |  7 -------
 meta-ti-bsp/conf/machine/include/ti33x.inc    |  9 ---------
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 12 ------------
 6 files changed, 32 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/am335x-evm.conf b/meta-ti-bsp/conf/machine/am335x-evm.conf
index 09bd3934..9301406b 100644
--- a/meta-ti-bsp/conf/machine/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -4,7 +4,6 @@ 
 
 require conf/machine/include/ti33x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "screen touchscreen"
 
 IMAGE_FSTYPES += "ubifs ubi"
diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf
index 4e3681d5..98602add 100644
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -4,7 +4,6 @@ 
 
 require conf/machine/include/ti43x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "ubifs ubi"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 7b353129..911b59bd 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -29,8 +29,6 @@  EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 TFA_PLATFORM = "k3"
 TFA_BOARD = "generic"
 
-MACHINE_GUI_CLASS = "smallscreen"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 8ab614f0..f548f3fd 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -40,13 +40,6 @@  UBOOT_SUFFIX = "img"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-video-fbdev"
-
-MACHINE_GUI_CLASS = "smallscreen"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 06d35f09..cfacc30d 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -4,15 +4,6 @@  SOC_FAMILY:append = ":ti33x"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard"
-
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r22"
 
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 98b374a1..0da5f761 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -4,18 +4,6 @@  SOC_FAMILY:append = ":ti43x"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard"
-
-# Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
-
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r3"