summaryrefslogtreecommitdiffstats
path: root/meta-ti-bsp/conf
diff options
context:
space:
mode:
authorRandolph Sapp <rs@ti.com>2023-01-30 17:20:06 -0600
committerRyan Eatmon <reatmon@ti.com>2023-02-16 13:31:05 -0600
commit51bb56b74cd2e7f7e922cce84a023f669291ef00 (patch)
tree33b5d4094417852db3873b08c644ee92c747e514 /meta-ti-bsp/conf
parent15417ca726f75881a2c51c08d258ea923803cbb9 (diff)
downloadmeta-ti-51bb56b74cd2e7f7e922cce84a023f669291ef00.tar.gz
meta-ti-bsp: machine: Remove all gpu features
Remove all gpu machine features and instead rely on the new dependency chain for resolving gpu dependencies. Set preferred providers for virtual/gpudriver where needed. Signed-off-by: Randolph Sapp <rs@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/conf')
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/am65xx.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/j721e.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/j721s2.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/j784s4.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc6
9 files changed, 5 insertions, 45 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..35f3f071 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -1,15 +1,11 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am62xx" 2SOC_FAMILY:append = ":am62xx"
3 3
4MACHINE_FEATURES += "screen touchscreen gpu" 4MACHINE_FEATURES += "screen touchscreen"
5 5
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..385bb164 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -1,15 +1,11 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am65xx" 2SOC_FAMILY:append = ":am65xx"
3 3
4MACHINE_FEATURES += "screen touchscreen gpu" 4MACHINE_FEATURES += "screen touchscreen"
5 5
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..67f5fe0f 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,12 +1,6 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j721e" 2SOC_FAMILY:append = ":j721e"
3 3
4MACHINE_FEATURES += "gpu"
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" 4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 5
12# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw 6# 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..f33a3aba 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,12 +1,6 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j721s2" 2SOC_FAMILY:append = ":j721s2"
3 3
4MACHINE_FEATURES += "gpu"
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" 4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 5
12TFA_BOARD = "generic" 6TFA_BOARD = "generic"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index d268b810..df0faede 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,12 +1,6 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":j784s4" 2SOC_FAMILY:append = ":j784s4"
3 3
4MACHINE_FEATURES += "gpu"
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" 4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
11 5
12TFA_BOARD = "j784s4" 6TFA_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..efa33a10 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"
@@ -45,7 +41,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
45UBI_VOLNAME = "rootfs" 41UBI_VOLNAME = "rootfs"
46 42
47# List common SoC features, may need to add touchscreen for specific machines 43# List common SoC features, may need to add touchscreen for specific machines
48MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" 44MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320"
49 45
50IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 46IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
51WKS_FILE ?= "sdimage-2part.wks" 47WKS_FILE ?= "sdimage-2part.wks"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index cfacc30d..e2f75359 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"
@@ -55,7 +51,7 @@ UBI_VOLNAME = "rootfs"
55EXTRA_IMAGEDEPENDS += "virtual/bootloader" 51EXTRA_IMAGEDEPENDS += "virtual/bootloader"
56 52
57# List common SoC features, may need to add touchscreen for specific machines 53# List common SoC features, may need to add touchscreen for specific machines
58MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" 54MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet"
59 55
60IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 56IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
61WKS_FILE ?= "sdimage-2part.wks" 57WKS_FILE ?= "sdimage-2part.wks"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 74a964db..e9999910 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"
@@ -54,7 +50,7 @@ UBI_VOLNAME = "rootfs"
54EXTRA_IMAGEDEPENDS += "u-boot" 50EXTRA_IMAGEDEPENDS += "u-boot"
55 51
56# List common SoC features, may need to add touchscreen for specific machines 52# List common SoC features, may need to add touchscreen for specific machines
57MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" 53MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet"
58 54
59IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 55IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
60WKS_FILE ?= "sdimage-2part.wks" 56WKS_FILE ?= "sdimage-2part.wks"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-02 19:10:34 +0000