summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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, 45 insertions, 5 deletions
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index ec9ce596..ef8e8692 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -4,6 +4,8 @@
4 4
5require conf/machine/include/am62xx.inc 5require conf/machine/include/am62xx.inc
6 6
7MACHINE_FEATURES += "gpu"
8
7KERNEL_DEVICETREE = " \ 9KERNEL_DEVICETREE = " \
8 ti/k3-am62x-lp-sk.dtb \ 10 ti/k3-am62x-lp-sk.dtb \
9 ti/k3-am625-skeleton.dtb \ 11 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 35f3f071..411e5265 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -1,11 +1,15 @@
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" 4MACHINE_FEATURES += "screen touchscreen gpu"
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"
9PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
10 14
11TFA_BOARD = "lite" 15TFA_BOARD = "lite"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 385bb164..424864d3 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -1,11 +1,15 @@
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" 4MACHINE_FEATURES += "screen touchscreen gpu"
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"
9PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
10 14
11KERNEL_DEVICETREE = " \ 15KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 67f5fe0f..eba10d8d 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,6 +1,12 @@
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"
4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
5 11
6# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw 12# 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 f33a3aba..fc6493b8 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,6 +1,12 @@
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"
4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
5 11
6TFA_BOARD = "generic" 12TFA_BOARD = "generic"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index df0faede..d268b810 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,6 +1,12 @@
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"
4PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 10PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
5 11
6TFA_BOARD = "j784s4" 12TFA_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 efa33a10..0843fb28 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -10,6 +10,10 @@ 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"
13PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
14 18
15KERNEL_IMAGETYPE = "zImage" 19KERNEL_IMAGETYPE = "zImage"
@@ -41,7 +45,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
41UBI_VOLNAME = "rootfs" 45UBI_VOLNAME = "rootfs"
42 46
43# List common SoC features, may need to add touchscreen for specific machines 47# List common SoC features, may need to add touchscreen for specific machines
44MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320" 48MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
45 49
46IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 50IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
47WKS_FILE ?= "sdimage-2part.wks" 51WKS_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 e2f75359..cfacc30d 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -11,6 +11,10 @@ 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"
14PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 18PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
15 19
16KERNEL_IMAGETYPE = "zImage" 20KERNEL_IMAGETYPE = "zImage"
@@ -51,7 +55,7 @@ UBI_VOLNAME = "rootfs"
51EXTRA_IMAGEDEPENDS += "virtual/bootloader" 55EXTRA_IMAGEDEPENDS += "virtual/bootloader"
52 56
53# List common SoC features, may need to add touchscreen for specific machines 57# List common SoC features, may need to add touchscreen for specific machines
54MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet" 58MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
55 59
56IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 60IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
57WKS_FILE ?= "sdimage-2part.wks" 61WKS_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 e9999910..74a964db 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -11,6 +11,10 @@ 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"
14PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 18PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
15 19
16KERNEL_IMAGETYPE = "zImage" 20KERNEL_IMAGETYPE = "zImage"
@@ -50,7 +54,7 @@ UBI_VOLNAME = "rootfs"
50EXTRA_IMAGEDEPENDS += "u-boot" 54EXTRA_IMAGEDEPENDS += "u-boot"
51 55
52# List common SoC features, may need to add touchscreen for specific machines 56# List common SoC features, may need to add touchscreen for specific machines
53MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet" 57MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
54 58
55IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 59IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
56WKS_FILE ?= "sdimage-2part.wks" 60WKS_FILE ?= "sdimage-2part.wks"