diff mbox series

[master,3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override

Message ID 20220505174422.334666-3-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master,1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config | expand

Commit Message

Denys Dmytriyenko May 5, 2022, 5:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Use weak assignment for default PREFERRED_PROVIDER values to allow user to
easily overwrite them from local.conf.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/am62xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721e.inc    | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721s2.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/k3.inc       |  4 ++--
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 14 +++++++-------
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 14 +++++++-------
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 14 +++++++-------
 8 files changed, 43 insertions(+), 43 deletions(-)
diff mbox series

Patch

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"
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
 # AM62 supports multi-certificate images, use the same
 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"
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_DEVICETREE = " \
     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"
 
 MACHINE_FEATURES += "gpu"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+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"
 
 MACHINE_FEATURES += "gpu"
 
-PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+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"
 MACHINE_KERNEL_PR = "r0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "Image"
 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
 MACHINE_KERNEL_PR = "r7"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 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"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"
 
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"
 
 # Default providers, may need to override for specific machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 
 KERNEL_IMAGETYPE = "zImage"