mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-27 14:28:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert "meta-ti-bsp: machine: Remove all gpu features"

Browse Source 
Merged by accident.

This reverts commit 51bb56b74c.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Denys Dmytriyenko
2023-02-21 01:02:41 +00:00
committed by Ryan Eatmon
parent 3529d4d4c9
commit 69563462d9
9 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+2
View File
@@ -4,6 +4,8 @@
require conf/machine/include/am62xx.inc require conf/machine/include/am62xx.inc
MACHINE_FEATURES += "gpu"
KERNEL_DEVICETREE = " \ KERNEL_DEVICETREE = " \
ti/k3-am62x-lp-sk.dtb \ ti/k3-am62x-lp-sk.dtb \
ti/k3-am625-skeleton.dtb \ ti/k3-am625-skeleton.dtb \
meta-ti-bsp/conf/machine/include/am62xx.inc
+5 -1
View File
@@ -1,11 +1,15 @@
require conf/machine/include/k3.inc require conf/machine/include/k3.inc
SOC_FAMILY:append = ":am62xx" SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen touchscreen" MACHINE_FEATURES += "screen touchscreen gpu"
SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES = "115200;ttyS2"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 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/gpudriver ?= "ti-img-rogue-driver"
TFA_BOARD = "lite" TFA_BOARD = "lite"
meta-ti-bsp/conf/machine/include/am65xx.inc
+5 -1
View File
@@ -1,11 +1,15 @@
require conf/machine/include/k3.inc require conf/machine/include/k3.inc
SOC_FAMILY:append = ":am65xx" SOC_FAMILY:append = ":am65xx"
MACHINE_FEATURES += "screen touchscreen" MACHINE_FEATURES += "screen touchscreen gpu"
SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 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/gpudriver ?= "ti-sgx-ddk-km"
KERNEL_DEVICETREE = " \ KERNEL_DEVICETREE = " \
meta-ti-bsp/conf/machine/include/j721e.inc
+6
View File
@@ -1,6 +1,12 @@
require conf/machine/include/k3.inc require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j721e" 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/gpudriver ?= "ti-img-rogue-driver"
# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
meta-ti-bsp/conf/machine/include/j721s2.inc
+6
View File
@@ -1,6 +1,12 @@
require conf/machine/include/k3.inc require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j721s2" 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/gpudriver ?= "ti-img-rogue-driver"
TFA_BOARD = "generic" TFA_BOARD = "generic"
meta-ti-bsp/conf/machine/include/j784s4.inc
+6
View File
@@ -1,6 +1,12 @@
require conf/machine/include/k3.inc require conf/machine/include/k3.inc
SOC_FAMILY:append = ":j784s4" SOC_FAMILY:append = ":j784s4"
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/gpudriver ?= "ti-img-rogue-driver"
TFA_BOARD = "j784s4" TFA_BOARD = "j784s4"
meta-ti-bsp/conf/machine/include/omap-a15.inc
+5 -1
View File
@@ -10,6 +10,10 @@ MACHINE_KERNEL_PR = "r7"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot ?= "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/gpudriver ?= "ti-sgx-ddk-km"
KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE = "zImage"
@@ -41,7 +45,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
UBI_VOLNAME = "rootfs" UBI_VOLNAME = "rootfs"
# List common SoC features, may need to add touchscreen for specific machines # List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks" WKS_FILE ?= "sdimage-2part.wks"
meta-ti-bsp/conf/machine/include/ti33x.inc
+5 -1
View File
@@ -11,6 +11,10 @@ MACHINE_KERNEL_PR = "r22"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot ?= "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/gpudriver ?= "ti-sgx-ddk-km"
KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE = "zImage"
@@ -51,7 +55,7 @@ UBI_VOLNAME = "rootfs"
EXTRA_IMAGEDEPENDS += "virtual/bootloader" EXTRA_IMAGEDEPENDS += "virtual/bootloader"
# List common SoC features, may need to add touchscreen for specific machines # List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks" WKS_FILE ?= "sdimage-2part.wks"
meta-ti-bsp/conf/machine/include/ti43x.inc
+5 -1
View File
@@ -11,6 +11,10 @@ MACHINE_KERNEL_PR = "r3"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot ?= "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/gpudriver ?= "ti-sgx-ddk-km"
KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE = "zImage"
@@ -50,7 +54,7 @@ UBI_VOLNAME = "rootfs"
EXTRA_IMAGEDEPENDS += "u-boot" EXTRA_IMAGEDEPENDS += "u-boot"
# List common SoC features, may need to add touchscreen for specific machines # List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
WKS_FILE ?= "sdimage-2part.wks" WKS_FILE ?= "sdimage-2part.wks"