summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandolph Sapp <rs@ti.com>2023-02-24 10:12:16 +0000
committerRyan Eatmon <reatmon@ti.com>2023-02-24 08:37:42 -0600
commit38bf9791a282621bc48e9f0b9cb88748c5f331f1 (patch)
tree0c6a79d4091bf68340b82bc21ac0dc19beeaeed0
parent56be4618abdde45649f0f92d383d5f44e5ec6efb (diff)
downloadmeta-ti-38bf9791a282621bc48e9f0b9cb88748c5f331f1.tar.gz
meta-ti-bsp: machine: remove default preferences for egl,gles,gbm
Remove default preferences for virtual/egl, virtual/libgles and virtual/libgbm from machine configs to follow the new dependency chains via mesa in oder to support accelerated and software-rendered graphics, which is selected by virtual/gpudriver preference. Signed-off-by: Randolph Sapp <rs@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/am65xx.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/j721e.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/j721s2.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/j784s4.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc4
9 files changed, 0 insertions, 34 deletions
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index ef8e8692..ec9ce596 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -4,8 +4,6 @@
4 4
5require conf/machine/include/am62xx.inc 5require conf/machine/include/am62xx.inc
6 6
7MACHINE_FEATURES += "gpu"
8
9KERNEL_DEVICETREE = " \ 7KERNEL_DEVICETREE = " \
10 ti/k3-am62x-lp-sk.dtb \ 8 ti/k3-am62x-lp-sk.dtb \
11 ti/k3-am625-skeleton.dtb \ 9 ti/k3-am625-skeleton.dtb \
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 411e5265..2a06fc0f 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,10 +6,6 @@ MACHINE_FEATURES += "screen touchscreen gpu"
6SERIAL_CONSOLES = "115200;ttyS2" 6SERIAL_CONSOLES = "115200;ttyS2"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8 8
9PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
10PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
11PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
12PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
14 10
15TFA_BOARD = "lite" 11TFA_BOARD = "lite"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 424864d3..33e6f1ad 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -6,10 +6,6 @@ MACHINE_FEATURES += "screen touchscreen gpu"
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" 6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8 8
9PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
10PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
11PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
12PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
14 10
15KERNEL_DEVICETREE = " \ 11KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index eba10d8d..74cdc0e7 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -3,10 +3,6 @@ SOC_FAMILY:append = ":j721e"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "gpu"
5 5
6PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
9PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 7
12# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw 8# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index fc6493b8..b0953c1a 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -3,10 +3,6 @@ SOC_FAMILY:append = ":j721s2"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "gpu"
5 5
6PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
9PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 7
12TFA_BOARD = "generic" 8TFA_BOARD = "generic"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index d268b810..48d20a21 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -3,10 +3,6 @@ SOC_FAMILY:append = ":j784s4"
3 3
4MACHINE_FEATURES += "gpu" 4MACHINE_FEATURES += "gpu"
5 5
6PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
9PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 6PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 7
12TFA_BOARD = "j784s4" 8TFA_BOARD = "j784s4"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 0843fb28..01769bb3 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -10,10 +10,6 @@ MACHINE_KERNEL_PR = "r7"
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" 10PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
11PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" 11PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
12PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" 12PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
13PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
14PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
15PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
16PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
18 14
19KERNEL_IMAGETYPE = "zImage" 15KERNEL_IMAGETYPE = "zImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index cfacc30d..24154d06 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -11,10 +11,6 @@ MACHINE_KERNEL_PR = "r22"
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" 11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" 12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" 13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
15PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
16PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
17PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
18PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 14PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
19 15
20KERNEL_IMAGETYPE = "zImage" 16KERNEL_IMAGETYPE = "zImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 74a964db..96a599ed 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -11,10 +11,6 @@ MACHINE_KERNEL_PR = "r3"
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" 11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" 12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" 13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
15PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
16PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
17PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
18PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 14PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
19 15
20KERNEL_IMAGETYPE = "zImage" 16KERNEL_IMAGETYPE = "zImage"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-02 16:34:54 +0000