* [PATCH 1/2] omapdrm_pvr: Define PVR_NULLDRM based on the availability of SGX
2015-11-25 22:53 [PATCH 0/2] Enable non-SGX build for AM3/AM4 Eric Ruei
@ 2015-11-25 22:53 ` Eric Ruei
2015-11-25 23:16 ` Denys Dmytriyenko
2015-11-25 22:53 ` [PATCH 2/2] omap5-sgx-ddk-um-linux: Configure DDK UM " Eric Ruei
2015-11-25 23:09 ` [PATCH 0/2] Enable non-SGX build for AM3/AM4 Denys Dmytriyenko
2 siblings, 1 reply; 5+ messages in thread
From: Eric Ruei @ 2015-11-25 22:53 UTC (permalink / raw)
To: meta-ti
From: Eric Ruei <a0850410@uda0850410>
Enable non-SGX build for AM3/AM4:
For ti43x, set PVR_NULLDRM to 1 only if SGX is not included at MACHINE_FEATURES.
Note: For ti33x, PVR_NULLDRM is always set to 1 becasue only nullDRM is
supported.
Signed-off-by: Eric Ruei <a0850410@uda0850410>
---
recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
index 50df3d9..da4ab74 100644
--- a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
+++ b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
@@ -24,7 +24,7 @@ SRCREV_ti33x = "2b7523d07a13ab704a24a7664749551f4a13ed32"
SRCREV_ti43x = "2b7523d07a13ab704a24a7664749551f4a13ed32"
PVR_NULLDRM_ti33x = "1"
-PVR_NULLDRM_ti43x = "0"
+PVR_NULLDRM_ti43x = "${@base_contains('MACHINE_FEATURES', 'sgx', '0', '1', d)}"
PVR_NULLDRM_omap-a15 = "0"
EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" PVR_NULLDRM=${PVR_NULLDRM}'
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] omap5-sgx-ddk-um-linux: Configure DDK UM based on the availability of SGX
2015-11-25 22:53 [PATCH 0/2] Enable non-SGX build for AM3/AM4 Eric Ruei
2015-11-25 22:53 ` [PATCH 1/2] omapdrm_pvr: Define PVR_NULLDRM based on the availability of SGX Eric Ruei
@ 2015-11-25 22:53 ` Eric Ruei
2015-11-25 23:09 ` [PATCH 0/2] Enable non-SGX build for AM3/AM4 Denys Dmytriyenko
2 siblings, 0 replies; 5+ messages in thread
From: Eric Ruei @ 2015-11-25 22:53 UTC (permalink / raw)
To: meta-ti
From: Eric Ruei <a0850410@uda0850410>
Enable non-SGX build for AM3/AM4:
- Remove SGX init support if SGX is not included at MACHINE_FEATURES.
- For ti43x: Select DDK UM libaries based on whether SGX is available
NullDRM libraries if SGX is not available
DRM/Wayland libraries if SGX is available
Select plugin lists based on whether SGX is available
Note: The nullDRM DDK libraries are still required for QT5 library and
application build for the non-SGX rendering support, however,
the SGX related APIs will not be invoked at the software rendering mode.
Signed-off-by: Eric Ruei <a0850410@uda0850410>
---
.../libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
index 8b032e3..0aefb33 100644
--- a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
@@ -7,12 +7,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
BRANCH_omap-a15 = "master"
BRANCH_ti33x = "am3/k4.1"
-BRANCH_ti43x = "am4/k4.1"
+BRANCH_ti43x = "${@base_contains('MACHINE_FEATURES', 'sgx', 'am4/k4.1', 'am3/k4.1', d)}"
SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}"
SRCREV_omap-a15 = "d63cd6469fff610317a8e1c986f227bb3e7922f6"
SRCREV_ti33x = "84ae5444c7cbc3f4c65a226b9fea62d4a513f3e0"
-SRCREV_ti43x = "fdf4c0b594ca142a68aabb4c3f82b75be50b46cc"
+SRCREV_ti43x = "${@base_contains('MACHINE_FEATURES', 'sgx', 'fdf4c0b594ca142a68aabb4c3f82b75be50b46cc', '84ae5444c7cbc3f4c65a226b9fea62d4a513f3e0', d)}"
INITSCRIPT_NAME = "pvr-init"
INITSCRIPT_PARAMS = "defaults 8"
@@ -44,15 +44,17 @@ do_install () {
install -m 0644 ${WORKDIR}/powervr.ini ${D}${sysconfdir}/
}
-FILES_${PN} = "${bindir}/*"
+FILES_${PN} = "${@base_contains('MACHINE_FEATURES', 'sgx', '${bindir}/*', '', d)}"
FILES_${PN} += " ${libdir}/*"
FILES_${PN} += "${includedir}/* /usr/share/sgx-lib/"
-FILES_${PN} += "${sysconfdir}/init.d/pvr-init"
-FILES_${PN} += "${sysconfdir}/powervr.ini"
+FILES_${PN} += "${@base_contains('MACHINE_FEATURES', 'sgx', '${sysconfdir}/init.d/pvr-init', '', d)}"
+FILES_${PN} += "${@base_contains('MACHINE_FEATURES', 'sgx', '${sysconfdir}/powervr.ini', '', d)}"
PACKAGES =+ "${PN}-plugins"
+SGX_PLUGINS_FILES_NULLDRM = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrDRMWSEGL.so ${libdir}/libpvrDRMWSEGL_FRONT.so "
+SGX_PLUGINS_FILES_DRM = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrws_WAYLAND.so ${libdir}/libpvrws_KMS.so "
FILES_${PN}-plugins = ""
-FILES_${PN}-plugins_ti43x = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrws_WAYLAND.so ${libdir}/libpvrws_KMS.so "
+FILES_${PN}-plugins_ti43x = "${@base_contains('MACHINE_FEATURES', 'sgx', SGX_PLUGINS_FILES_DRM, SGX_PLUGINS_FILES_NULLDRM, d)}"
FILES_${PN}-plugins_ti33x = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libpvrDRMWSEGL.so ${libdir}/libpvrDRMWSEGL_FRONT.so "
RDEPENDS_${PN} += "${PN}-plugins"
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread