Skip to contentSkip to conversation

am62xx, j721s2: move "gpu" machine feature from machine to soc config

PATCH In review Denys Dmytriyenko 2 participants 6 messages May 5, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 am62xx, j721s2: move "gpu" machine feature from machine to soc config

From: Denys Dmytriyenko <[email protected]>

In most cases machine features should be set in the corresponding SoC config to be applicable to different machine variants, like GP, HS or custom board.

---
 meta-ti-bsp/conf/machine/am62xx-evm.conf    | 2 --
 meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +-
 meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++
 meta-ti-bsp/conf/machine/j721s2-evm.conf    | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)
meta-ti-bsp/conf/machine/am62xx-evm.conf +0 -2
index 44f46d78..33b3294e 100644
@@ -4,8 +4,6 @@
 
 require conf/machine/include/am62xx.inc
 
-MACHINE_FEATURES += "gpu"
-
 KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
     ti/k3-am625-sk-csi2-ov5640.dtb \
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -1
index f3bde639..56cd7c20 100644
@@ -1,7 +1,7 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":am62xx"
 
-MACHINE_FEATURES += "screen touchscreen"
+MACHINE_FEATURES += "screen touchscreen gpu"
 
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
meta-ti-bsp/conf/machine/include/j721s2.inc +2 -0
index 113f86c4..06654179 100644
@@ -1,2 +1,4 @@
 require conf/machine/include/j7.inc
 SOC_FAMILY:append = ":j721s2"
+
+MACHINE_FEATURES += "gpu"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -2
index 5d977776..a2c15f74 100644
@@ -4,8 +4,6 @@
 
 require conf/machine/include/j721s2.inc
 
-MACHINE_FEATURES += "gpu"
-
 SERIAL_CONSOLES = "115200;ttyS10"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 TFA_K3_USART = "0x8"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/5 conf/machine: add preferences for 3D graphics providers

From: Denys Dmytriyenko <[email protected]>

Specify default 3D GLES/EGL providers for platforms using SGX and Rogue GPUs, both kernel and user-space components.

---
 meta-ti-bsp/conf/machine/include/am62xx.inc   | 6 ++++++
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 6 ++++++
 meta-ti-bsp/conf/machine/include/j721e.inc    | 6 ++++++
 meta-ti-bsp/conf/machine/include/j721s2.inc   | 6 ++++++
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 5 +++++
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 5 +++++
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 5 +++++
 7 files changed, 39 insertions(+)
meta-ti-bsp/conf/machine/include/am62xx.inc +6 -0
index 56cd7c20..ce768895 100644
@@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen touchscreen gpu"
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
+PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+
 # AM62 supports multi-certificate images, use the same
 IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
 
meta-ti-bsp/conf/machine/include/am65xx.inc +6 -0
index 111ef96f..b71b4686 100644
@@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen touchscreen gpu"
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board.dtb \
     ti/k3-am654-base-board-sr1.dtbo \
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
index d965327c..85952d32 100644
@@ -2,3 +2,9 @@ require conf/machine/include/j7.inc
 SOC_FAMILY:append = ":j721e"
 
 MACHINE_FEATURES += "gpu"
+
+PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
meta-ti-bsp/conf/machine/include/j721s2.inc +6 -0
index 06654179..65b39118 100644
@@ -2,3 +2,9 @@ require conf/machine/include/j7.inc
 SOC_FAMILY:append = ":j721s2"
 
 MACHINE_FEATURES += "gpu"
+
+PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
meta-ti-bsp/conf/machine/include/omap-a15.inc +5 -0
index 94ecab34..7cff38dc 100644
@@ -10,6 +10,11 @@ MACHINE_KERNEL_PR = "r7"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_IMAGETYPES = "zImage uImage"
meta-ti-bsp/conf/machine/include/ti33x.inc +5 -0
index 083a24b6..2f493404 100644
@@ -20,6 +20,11 @@ MACHINE_KERNEL_PR = "r22"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 
meta-ti-bsp/conf/machine/include/ti43x.inc +5 -0
index 8757b545..3d69e453 100644
@@ -23,6 +23,11 @@ MACHINE_KERNEL_PR = "r3"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/5 conf/machine: make default PREFERRED_PROVIDERs easy to override

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

Use weak assignment for default PREFERRED_PROVIDER values to allow user to easily overwrite them from local.conf.

---
 meta-ti-bsp/conf/machine/include/am62xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721e.inc    | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721s2.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/k3.inc       |  4 ++--
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 14 +++++++-------
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 14 +++++++-------
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 14 +++++++-------
 8 files changed, 43 insertions(+), 43 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +5 -5
index ce768895..bcf435f5 100644
@@ -6,11 +6,11 @@ MACHINE_FEATURES += "screen touchscreen gpu"
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
 # AM62 supports multi-certificate images, use the same
 IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
meta-ti-bsp/conf/machine/include/am65xx.inc +5 -5
index b71b4686..d6bd9810 100644
@@ -6,11 +6,11 @@ MACHINE_FEATURES += "screen touchscreen gpu"
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board.dtb \
meta-ti-bsp/conf/machine/include/j721e.inc +5 -5
index 85952d32..fe260178 100644
@@ -3,8 +3,8 @@ SOC_FAMILY:append = ":j721e"
 
 MACHINE_FEATURES += "gpu"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
meta-ti-bsp/conf/machine/include/j721s2.inc +5 -5
index 65b39118..5cd74683 100644
@@ -3,8 +3,8 @@ SOC_FAMILY:append = ":j721s2"
 
 MACHINE_FEATURES += "gpu"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
meta-ti-bsp/conf/machine/include/k3.inc +2 -2
index a39ddd2a..7b353129 100644
@@ -11,8 +11,8 @@ BBMULTICONFIG += "k3r5"
 MACHINE_KERNEL_PR = "r0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "Image"
 KERNEL_IMAGETYPES = "Image vmlinux.gz"
meta-ti-bsp/conf/machine/include/omap-a15.inc +7 -7
index 7cff38dc..8ab614f0 100644
@@ -8,13 +8,13 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 MACHINE_KERNEL_PR = "r7"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_IMAGETYPES = "zImage uImage"
meta-ti-bsp/conf/machine/include/ti33x.inc +7 -7
index 2f493404..06d35f09 100644
@@ -18,13 +18,13 @@ MACHINE_KERNEL_PR = "r22"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 
meta-ti-bsp/conf/machine/include/ti43x.inc +7 -7
index 3d69e453..98b374a1 100644
@@ -21,13 +21,13 @@ MACHINE_KERNEL_PR = "r3"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 
Signature · 1 line
2.25.1
#3 lore raw

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

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

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.

---
 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(-)
meta-ti-bsp/conf/machine/am335x-evm.conf +0 -1
index 09bd3934..9301406b 100644
@@ -4,7 +4,6 @@
 
 require conf/machine/include/ti33x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "screen touchscreen"
 
 IMAGE_FSTYPES += "ubifs ubi"
meta-ti-bsp/conf/machine/am437x-evm.conf +0 -1
index 4e3681d5..98602add 100644
@@ -4,7 +4,6 @@
 
 require conf/machine/include/ti43x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "ubifs ubi"
meta-ti-bsp/conf/machine/include/k3.inc +0 -2
index 7b353129..911b59bd 100644
@@ -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"
meta-ti-bsp/conf/machine/include/omap-a15.inc +0 -7
index 8ab614f0..f548f3fd 100644
@@ -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"
meta-ti-bsp/conf/machine/include/ti33x.inc +0 -9
index 06d35f09..cfacc30d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/ti43x.inc +0 -12
index 98b374a1..0da5f761 100644
@@ -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"
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH 5/5 ti-rtos-firmware: remove duplicate assignment

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

FILES:${PN} is being assigned twice, remove duplicate.

---
 meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 2 --
 1 file changed, 2 deletions(-)
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +0 -2
index f3912784..93429570 100644
@@ -33,8 +33,6 @@ PR = "${INC_PR}.0"
 # Secure Build 
 DEPENDS += "openssl-native"
 
-FILES:${PN} += "${nonarch_base_libdir}"
-
 TI_SECURE_DEV_PKG ?= ""
 
 RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}"
Signature · 1 line
2.25.1
#5 lore raw
In reply to Denys Dmytriyenko

Series applied to master.

Quoted 72 lines · Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

In most cases machine features should be set in the corresponding SoC config to be applicable to different machine variants, like GP, HS or custom board.

---
  meta-ti-bsp/conf/machine/am62xx-evm.conf    | 2 --
  meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +-
  meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++
  meta-ti-bsp/conf/machine/j721s2-evm.conf    | 2 --
  4 files changed, 3 insertions(+), 5 deletions(-)
meta-ti-bsp/conf/machine/am62xx-evm.conf +0 -2
index 44f46d78..33b3294e 100644
@@ -4,8 +4,6 @@
 
  require conf/machine/include/am62xx.inc
 
-MACHINE_FEATURES += "gpu"
-
  KERNEL_DEVICETREE = " \
      ti/k3-am625-sk.dtb \
      ti/k3-am625-sk-csi2-ov5640.dtb \
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -1
index f3bde639..56cd7c20 100644
@@ -1,7 +1,7 @@
  require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":am62xx"
 
-MACHINE_FEATURES += "screen touchscreen"
+MACHINE_FEATURES += "screen touchscreen gpu"
 
  SERIAL_CONSOLES = "115200;ttyS2"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
meta-ti-bsp/conf/machine/include/j721s2.inc +2 -0
index 113f86c4..06654179 100644
@@ -1,2 +1,4 @@
  require conf/machine/include/j7.inc
  SOC_FAMILY:append = ":j721s2"
+
+MACHINE_FEATURES += "gpu"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -3
index 5d977776..a2c15f74 100644
@@ -4,8 +4,6 @@
 
  require conf/machine/include/j721s2.inc
 
-MACHINE_FEATURES += "gpu"
-
  SERIAL_CONSOLES = "115200;ttyS10"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
  TFA_K3_USART = "0x8"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#14706): https://lists.yoctoproject.org/g/meta-ti/message/14706
Mute This Topic: https://lists.yoctoproject.org/mt/90916827/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS