meta-ti@lists.yoctoproject.org | [master][PATCH 3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override

Home Messages Hashtags Subgroups Wiki

Date Date 1 - 1 of 1

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

Denys Dmytriyenko #14707 From: Denys Dmytriyenko <denys@...> Use weak assignment for default PREFERRED_PROVIDER values to allow user t= o easily overwrite them from local.conf. Signed-off-by: Denys Dmytriyenko <denys@...> --- 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 --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/co= nf/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 +=3D "screen touchscreen gpu" SERIAL_CONSOLES =3D "115200;ttyS2" SERIAL_CONSOLES_CHECK =3D "${SERIAL_CONSOLES}" =20 -PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" =20 # AM62 supports multi-certificate images, use the same IMAGE_BOOT_FILES =3D "${IMAGE_BOOT_FILES_MULTI_CERT}" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/co= nf/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 +=3D "screen touchscreen gpu" SERIAL_CONSOLES =3D "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK =3D "${SERIAL_CONSOLES}" =20 -PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-sgx-ddk-km" =20 KERNEL_DEVICETREE =3D " \ ti/k3-am654-base-board.dtb \ diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/con= f/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 =3D ":j721e" =20 MACHINE_FEATURES +=3D "gpu" =20 -PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/co= nf/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 =3D ":j721s2" =20 MACHINE_FEATURES +=3D "gpu" =20 -PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-img-rogue-driver" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/m= achine/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 +=3D "k3r5" MACHINE_KERNEL_PR =3D "r0" =20 PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" =20 KERNEL_IMAGETYPE =3D "Image" KERNEL_IMAGETYPES =3D "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 =3D "r7" =20 PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km" +PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-sgx-ddk-km" =20 KERNEL_IMAGETYPE =3D "zImage" KERNEL_IMAGETYPES =3D "zImage uImage" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/con= f/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 =3D "r22" =20 # Default providers, may need to override for specific machines PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km" +PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-sgx-ddk-km" =20 KERNEL_IMAGETYPE =3D "zImage" =20 diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/con= f/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 =3D "r3" =20 # Default providers, may need to override for specific machines PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km" +PREFERRED_PROVIDER_virtual/bootloader ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?=3D "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?=3D "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver ?=3D "ti-sgx-ddk-km" =20 KERNEL_IMAGETYPE =3D "zImage" =20 --=20 2.25.1
More All Messages By This Member

1 - 1 of 1

1

Previous Topic Next Topic

Home Hashtags Subgroups Wiki Terms