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


Denys Dmytriyenko
 

From: Denys Dmytriyenko <denys@...>

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 kerne=
l
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@...>
---
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 --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 @@
=20
require conf/machine/include/ti33x.inc
=20
-MACHINE_GUI_CLASS =3D "smallscreen"
MACHINE_FEATURES +=3D "screen touchscreen"
=20
IMAGE_FSTYPES +=3D "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 @@
=20
require conf/machine/include/ti43x.inc
=20
-MACHINE_GUI_CLASS =3D "smallscreen"
MACHINE_FEATURES +=3D "touchscreen"
=20
IMAGE_FSTYPES +=3D "ubifs ubi"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/m=
achine/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 +=3D "virtual/bootloader"
TFA_PLATFORM =3D "k3"
TFA_BOARD =3D "generic"
=20
-MACHINE_GUI_CLASS =3D "smallscreen"
-
# Use the expected value of the ubifs filesystem's volume name in the ke=
rnel
# and u-boot.
UBI_VOLNAME =3D "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 =3D "img"
=20
EXTRA_IMAGEDEPENDS +=3D "virtual/bootloader"
=20
-PREFERRED_PROVIDER_virtual/xserver =3D "xserver-xorg"
-XSERVER =3D "xserver-xorg \
- xf86-input-evdev \
- xf86-video-fbdev"
-
-MACHINE_GUI_CLASS =3D "smallscreen"
-
# Use the expected value of the ubifs filesystem's volume name in the ke=
rnel
# and u-boot.
UBI_VOLNAME =3D "rootfs"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/con=
f/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 =3D ":ti33x"
DEFAULTTUNE ?=3D "armv7athf-neon"
require conf/machine/include/arm/armv7a/tune-cortexa8.inc
=20
-PREFERRED_PROVIDER_virtual/xserver =3D "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER =3D "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 =3D "r22"
=20
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/con=
f/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 =3D ":ti43x"
DEFAULTTUNE ?=3D "armv7athf-neon"
require conf/machine/include/arm/armv7a/tune-cortexa9.inc
=20
-PREFERRED_PROVIDER_virtual/xserver =3D "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER =3D "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 =3D "bigscreen"
-
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR =3D "r3"
=20
--=20
2.25.1

Join meta-ti@lists.yoctoproject.org to automatically receive all group messages.