1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-12 01:20:20 +00:00

ti-bsp: Do not remove gpu MACHINE_FEATURE conditionally on BSP version

Setting or removing the gpu MACHINE_FEATURE does not actually change
if the GPU driver is built or not. That is done based on the setting
of the BSP_{SGX,ROGUE}_{DRIVER,UMLIBS}_{PROVIDER,VERSION} vars. These
are default empty for BSP versions without supported GPU drivers, which
will correctly cause a fallback to SW rendering when the GPU driver is
not available.

As the "gpu" MACHINE_FEATURE now has no uses, remove it from all the
machine config include files.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2025-09-18 08:28:39 -05:00
committed by Ryan Eatmon
parent 88f31a7fb6
commit 12ed4dfce4
15 changed files with 14 additions and 22 deletions

View File

@@ -7,7 +7,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
SERIAL_CONSOLES = "115200;ttyS2"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":am62pxx"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":am65xx"
MACHINE_FEATURES += "screen touchscreen gpu"
MACHINE_FEATURES += "screen touchscreen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j721s2"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j784s4"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j721e"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j721s2"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j722s"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j742s2"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":j784s4"
MACHINE_FEATURES += "screen gpu"
MACHINE_FEATURES += "screen"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

View File

@@ -42,7 +42,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
UBI_VOLNAME = "rootfs"
# List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc320"
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"

View File

@@ -18,10 +18,6 @@ BSP_KERNEL_VERSION:bsp-mainline = "%"
BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline"
BSP_BOOTLOADER_VERSION:bsp-mainline = "%"
# GPU support requires out-of-tree SGX and Rogue drivers not available
# in mainline, usually present in TI staging or derivative like BB.org
MACHINE_FEATURES:remove:bsp-mainline = "gpu"
# GC320 support requires out-of-tree drivers not available in mainline
MACHINE_FEATURES:remove:bsp-mainline = "gc320"
@@ -34,10 +30,6 @@ BSP_KERNEL_VERSION:bsp-next = "%"
BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
BSP_BOOTLOADER_VERSION:bsp-next = "%"
# GPU support requires out-of-tree SGX and Rogue drivers not available
# in next, usually present in TI staging or derivative like BB.org
MACHINE_FEATURES:remove:bsp-next = "gpu"
# GC320 support requires out-of-tree drivers not yet available in next
MACHINE_FEATURES:remove:bsp-next = "gc320"

View File

@@ -88,7 +88,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
# List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"

View File

@@ -60,7 +60,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
# List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks"