- Add a new virtual provider for GPU driver - Specify Rogue and SGX as GPU driver provider for J7 and other platforms - Replace SGX with virtual GPU provider in package groups
Signed-off-by: Anand Balagopalakrishnan <[email protected]> Conflicts: meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb --- meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 ++ .../packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb | 3 +-- .../packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb | 2 +- .../recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc index 25d32d5..939569c 100644 --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc @@ -11,11 +11,13 @@ PREFERRED_PROVIDER_virtual/gettext = "gettext" 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/gpudriver = "ti-sgx-ddk-km" # J7 has a Rogue GPU core PREFERRED_PROVIDER_virtual/egl_j7-evm = "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/libgles1_j7-evm = "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/libgles2_j7-evm = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver_j7-evm = "ti-img-rogue-driver" # OpenGL preferences PREFERRED_PROVIDER_virtual/libgl = "mesa-gl" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb index d7ac1ef..486d080 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb @@ -6,8 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -GRAPHICS_RDEPENDS = "ti-sgx-ddk-km-src" -GRAPHICS_RDEPENDS_remove_j7-evm = "ti-sgx-ddk-km-src" +GRAPHICS_RDEPENDS = "${PREFERRED_PROVIDER_virtual/gpudriver}-src" GRAPHICS_RDEPENDS_append_omap-a15 = "\ ti-gc320-driver-src \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb index c461f9b..bc6215e 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb @@ -12,7 +12,7 @@ GRAPHICS_RDEPENDS = "\ wayland-dev \ weston-dev \ ${PREFERRED_PROVIDER_virtual/egl}-dev \ - ti-sgx-ddk-km-dev \ + ${PREFERRED_PROVIDER_virtual/gpudriver}-dev \ " GRAPHICS_RDEPENDS_remove_j7-evm = "ti-sgx-ddk-km-dev" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb index 16be54a..9fa5123 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb @@ -24,7 +24,7 @@ GRAPHICS_WAYLAND_append_k3 = "\ GRAPHICS_RDEPENDS = "\ libgbm \ ${PREFERRED_PROVIDER_virtual/egl} \ - ${@bb.utils.contains('MACHINE_FEATURES','sgx','ti-sgx-ddk-km','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','sgx','${PREFERRED_PROVIDER_virtual/gpudriver}','',d)} \ ${@bb.utils.contains('MACHINE_FEATURES','sgx','glmark2','',d)} \ " GRAPHICS_RDEPENDS_remove_j7-evm = "ti-sgx-ddk-km" -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
