diff options
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am62xx.inc | 10 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 10 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721e.inc | 10 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/j721s2.inc | 10 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/k3.inc | 4 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/omap-a15.inc | 14 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti33x.inc | 14 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti43x.inc | 14 |
8 files changed, 43 insertions, 43 deletions
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index ce768895..bcf435f5 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc | |||
@@ -6,11 +6,11 @@ MACHINE_FEATURES += "screen touchscreen gpu" | |||
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" | 9 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
10 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" | 10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" |
11 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" | 11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
12 | PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" | 12 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
13 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" | 13 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
14 | 14 | ||
15 | # AM62 supports multi-certificate images, use the same | 15 | # AM62 supports multi-certificate images, use the same |
16 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" | 16 | IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index b71b4686..d6bd9810 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -6,11 +6,11 @@ MACHINE_FEATURES += "screen touchscreen gpu" | |||
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" | 9 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" |
10 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" | 10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" |
11 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" | 11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" |
12 | PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" | 12 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" |
13 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" | 13 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
14 | 14 | ||
15 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_DEVICETREE = " \ |
16 | ti/k3-am654-base-board.dtb \ | 16 | ti/k3-am654-base-board.dtb \ |
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 85952d32..fe260178 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc | |||
@@ -3,8 +3,8 @@ SOC_FAMILY:append = ":j721e" | |||
3 | 3 | ||
4 | MACHINE_FEATURES += "gpu" | 4 | MACHINE_FEATURES += "gpu" |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs" | 6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
7 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" | 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" |
8 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
9 | PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
10 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 65b39118..5cd74683 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc | |||
@@ -3,8 +3,8 @@ SOC_FAMILY:append = ":j721s2" | |||
3 | 3 | ||
4 | MACHINE_FEATURES += "gpu" | 4 | MACHINE_FEATURES += "gpu" |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs" | 6 | PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" |
7 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" | 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" |
8 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" |
9 | PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" | 9 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" |
10 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" | 10 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" |
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index a39ddd2a..7b353129 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -11,8 +11,8 @@ BBMULTICONFIG += "k3r5" | |||
11 | MACHINE_KERNEL_PR = "r0" | 11 | MACHINE_KERNEL_PR = "r0" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
14 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" | 14 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
15 | PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" | 15 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
16 | 16 | ||
17 | KERNEL_IMAGETYPE = "Image" | 17 | KERNEL_IMAGETYPE = "Image" |
18 | KERNEL_IMAGETYPES = "Image vmlinux.gz" | 18 | KERNEL_IMAGETYPES = "Image vmlinux.gz" |
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 7cff38dc..8ab614f0 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc | |||
@@ -8,13 +8,13 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc | |||
8 | MACHINE_KERNEL_PR = "r7" | 8 | MACHINE_KERNEL_PR = "r7" |
9 | 9 | ||
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" | 13 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" |
14 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" | 14 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" |
15 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" | 15 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" |
16 | PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" | 16 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" |
17 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" | 17 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
18 | 18 | ||
19 | KERNEL_IMAGETYPE = "zImage" | 19 | KERNEL_IMAGETYPE = "zImage" |
20 | KERNEL_IMAGETYPES = "zImage uImage" | 20 | KERNEL_IMAGETYPES = "zImage uImage" |
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 2f493404..06d35f09 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc | |||
@@ -18,13 +18,13 @@ MACHINE_KERNEL_PR = "r22" | |||
18 | 18 | ||
19 | # Default providers, may need to override for specific machines | 19 | # Default providers, may need to override for specific machines |
20 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 20 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
21 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" | 21 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
22 | PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" | 22 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
23 | PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" | 23 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" |
24 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" | 24 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" |
25 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" | 25 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" |
26 | PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" | 26 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" |
27 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" | 27 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
28 | 28 | ||
29 | KERNEL_IMAGETYPE = "zImage" | 29 | KERNEL_IMAGETYPE = "zImage" |
30 | 30 | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 3d69e453..98b374a1 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc | |||
@@ -21,13 +21,13 @@ MACHINE_KERNEL_PR = "r3" | |||
21 | 21 | ||
22 | # Default providers, may need to override for specific machines | 22 | # Default providers, may need to override for specific machines |
23 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" | 23 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" |
24 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" | 24 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" |
25 | PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" | 25 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" |
26 | PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" | 26 | PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" |
27 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" | 27 | PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" |
28 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" | 28 | PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" |
29 | PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" | 29 | PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" |
30 | PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" | 30 | PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" |
31 | 31 | ||
32 | KERNEL_IMAGETYPE = "zImage" | 32 | KERNEL_IMAGETYPE = "zImage" |
33 | 33 | ||