diff options
-rw-r--r-- | meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am62xx.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721e.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721s2.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j784s4.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/omap-a15.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti33x.inc | 6 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti43x.inc | 6 |
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 | ||
5 | require conf/machine/include/am62xx.inc | 5 | require conf/machine/include/am62xx.inc |
6 | 6 | ||
7 | MACHINE_FEATURES += "gpu" | ||
8 | |||
7 | KERNEL_DEVICETREE = " \ | 9 | KERNEL_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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":am62xx" | 2 | SOC_FAMILY:append = ":am62xx" |
3 | 3 | ||
4 | MACHINE_FEATURES += "screen touchscreen" | 4 | MACHINE_FEATURES += "screen touchscreen gpu" |
5 | 5 | ||
6 | SERIAL_CONSOLES = "115200;ttyS2" | 6 | SERIAL_CONSOLES = "115200;ttyS2" |
7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
8 | 8 | ||
9 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | ||
10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | ||
11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | ||
12 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | ||
9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 13 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
10 | 14 | ||
11 | TFA_BOARD = "lite" | 15 | TFA_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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":am65xx" | 2 | SOC_FAMILY:append = ":am65xx" |
3 | 3 | ||
4 | MACHINE_FEATURES += "screen touchscreen" | 4 | MACHINE_FEATURES += "screen touchscreen gpu" |
5 | 5 | ||
6 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" | 6 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" |
7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 7 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
8 | 8 | ||
9 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" | ||
10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" | ||
11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" | ||
12 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" | ||
9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 13 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
10 | 14 | ||
11 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j721e" | 2 | SOC_FAMILY:append = ":j721e" |
3 | 3 | ||
4 | MACHINE_FEATURES += "gpu" | ||
5 | |||
6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | ||
7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | ||
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | ||
9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | ||
4 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j721s2" | 2 | SOC_FAMILY:append = ":j721s2" |
3 | 3 | ||
4 | MACHINE_FEATURES += "gpu" | ||
5 | |||
6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | ||
7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | ||
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | ||
9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | ||
4 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
5 | 11 | ||
6 | TFA_BOARD = "generic" | 12 | TFA_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 @@ | |||
1 | require conf/machine/include/k3.inc | 1 | require conf/machine/include/k3.inc |
2 | SOC_FAMILY:append = ":j784s4" | 2 | SOC_FAMILY:append = ":j784s4" |
3 | 3 | ||
4 | MACHINE_FEATURES += "gpu" | ||
5 | |||
6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" | ||
7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" | ||
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" | ||
9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" | ||
4 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
5 | 11 | ||
6 | TFA_BOARD = "j784s4" | 12 | TFA_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" | |||
10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
11 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | 11 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
12 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | 12 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
13 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" | ||
14 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" | ||
15 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" | ||
16 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" | ||
13 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
14 | 18 | ||
15 | KERNEL_IMAGETYPE = "zImage" | 19 | KERNEL_IMAGETYPE = "zImage" |
@@ -41,7 +45,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" | |||
41 | UBI_VOLNAME = "rootfs" | 45 | UBI_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 |
44 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320" | 48 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" |
45 | 49 | ||
46 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" | 50 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" |
47 | WKS_FILE ?= "sdimage-2part.wks" | 51 | WKS_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" | |||
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | 12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | 13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
14 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" | ||
15 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" | ||
16 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" | ||
17 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" | ||
14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 18 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
15 | 19 | ||
16 | KERNEL_IMAGETYPE = "zImage" | 20 | KERNEL_IMAGETYPE = "zImage" |
@@ -51,7 +55,7 @@ UBI_VOLNAME = "rootfs" | |||
51 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 55 | EXTRA_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 |
54 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet" | 58 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" |
55 | 59 | ||
56 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" | 60 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" |
57 | WKS_FILE ?= "sdimage-2part.wks" | 61 | WKS_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" | |||
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" | 12 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" | 13 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
14 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" | ||
15 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" | ||
16 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" | ||
17 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" | ||
14 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" | 18 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
15 | 19 | ||
16 | KERNEL_IMAGETYPE = "zImage" | 20 | KERNEL_IMAGETYPE = "zImage" |
@@ -50,7 +54,7 @@ UBI_VOLNAME = "rootfs" | |||
50 | EXTRA_IMAGEDEPENDS += "u-boot" | 54 | EXTRA_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 |
53 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet" | 57 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" |
54 | 58 | ||
55 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" | 59 | IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" |
56 | WKS_FILE ?= "sdimage-2part.wks" | 60 | WKS_FILE ?= "sdimage-2part.wks" |