As opencl is rather belongs to DISTRO_FEATURES and not MACHINE_FEATURES Moreover, opencl as MACHINE_FEATURES was not fully working and will require more changes.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/include/branding-core.inc | 4 ---- meta-arago-distro/conf/distro/include/branding-processor-sdk.inc | 2 +- meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc | 2 +- meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 4 ++-- .../recipes-core/images/tisdk-server-extra-rootfs-image.bb | 2 +- meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 2 +- .../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb | 4 ++-- .../packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb | 2 +- .../packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb | 2 +- .../recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb | 2 +- .../packagegroups/packagegroup-arago-toolchain-tisdk-target.bb | 2 +- 11 files changed, 12 insertions(+), 16 deletions(-) diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc index 5df8109..a506e3c 100644 --- a/meta-arago-distro/conf/distro/include/branding-core.inc +++ b/meta-arago-distro/conf/distro/include/branding-core.inc @@ -10,7 +10,3 @@ ALTERNATIVE_PRIORITY_pn-opencl-monitor = "1" # Raise priority for sample IPC FW images ALTERNATIVE_PRIORITY_pn-ti-ipc-rtos = "15" - -# Temporarily disable "opencl" machine feature for all SOCs while building -# latest code base, until it is fixed for 4.9 kernel -MACHINE_FEATURES := "${@d.getVar('MACHINE_FEATURES', True).replace('opencl', '')}" diff --git a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc index 01ae13e..166e259 100644 --- a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc +++ b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc @@ -1,7 +1,7 @@ ARAGO_TISDK_IMAGE = "processor-sdk-linux-image" # Set CMEM reserved memory region -RESERVE_CMEM = "${@bb.utils.contains('MACHINE_FEATURES','opencl','1','0',d)}" +RESERVE_CMEM = "${@bb.utils.contains('MACHINE_FEATURES','dsp','1','0',d)}" CMEM_BASE_omap-a15 ?= "a0000000" CMEM_SIZE_omap-a15 ?= "08000000" diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc index c619da5..71041f8 100644 --- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc @@ -53,7 +53,7 @@ IMAGE_INSTALL_QT_omapl138 = "" IMAGE_INSTALL = "\ packagegroup-arago-tisdk-addons-sdk-host \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl-sdk-host','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-sdk-host','',d)} \ packagegroup-arago-tisdk-crypto-sdk-host \ ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-host','',d)} \ packagegroup-arago-tisdk-matrix-sdk-host \ diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb index a169107..c511b83 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb @@ -10,8 +10,8 @@ IMAGE_INSTALL += "\ packagegroup-arago-test-addons \ ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \ packagegroup-arago-tisdk-qte \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl-extra','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ packagegroup-arago-tisdk-connectivity \ packagegroup-arago-tisdk-crypto \ packagegroup-arago-tisdk-matrix \ diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb index aafb814..f0c7cef 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb @@ -3,7 +3,7 @@ require recipes-core/images/tisdk-server-rootfs-image.bb IMAGE_INSTALL += "\ packagegroup-arago-test-addons \ packagegroup-arago-tisdk-addons-extra \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl-extra','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ packagegroup-arago-tisdk-multimedia \ " diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb index 2f5857f..b64d092 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb @@ -6,7 +6,7 @@ SPLASH = "" IMAGE_INSTALL += "\ packagegroup-arago-tisdk-addons \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \ packagegroup-arago-tisdk-crypto \ packagegroup-arago-tisdk-matrix \ packagegroup-arago-base-tisdk-server-extra \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index 21d8918..1cc3c42 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -144,6 +144,6 @@ RDEPENDS_${PN} = " \ ${MATRIX_TOUCH_APPS} \ ${MATRIX_APPS} \ ${@bb.utils.contains('MACHINE_FEATURES','sgx',"${MATRIX_SGX_DEMOS}",'',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl',"${MATRIX_OPENCL_APPS}",'',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl',"${MATRIX_OPENCV_OPENCL_APPS}",'',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCL_APPS}",'',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCV_OPENCL_APPS}",'',d)} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb index cded1aa..4958f39 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb @@ -19,7 +19,7 @@ MULTIMEDIA_append_ti33x = " barcode-roi-src" MULTIMEDIA_append_omap-a15 = " barcode-roi-src" MULTIMEDIA_append_dra7xx = " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'opencl', 'qt-opencv-opencl-opengl-multithreaded-src', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-src', '', d)} \ " MULTIMEDIA_append_keystone = " barcode-roi-src" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb index 3c72bf0..404fef8 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb @@ -11,7 +11,7 @@ MULTIMEDIA = "" MULTIMEDIA_append_dra7xx = " \ hevc-arm-decoder-dev \ hevc-arm-decoder-staticdev \ - ${@bb.utils.contains('MACHINE_FEATURES', 'opencl', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ " MULTIMEDIA_append_ti33x = " barcode-roi-dev" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb index 67d8d47..0db3856 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb @@ -20,7 +20,7 @@ MULTIMEDIA_append_ti43x = " \ MULTIMEDIA_append_dra7xx = " \ hevc-arm-decoder \ - ${@bb.utils.contains('MACHINE_FEATURES', 'opencl', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ " MULTIMEDIA_append_omap5-evm = " \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb index 157b1f3..42e1cd4 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb @@ -25,6 +25,6 @@ RDEPENDS_${PN} = "\ ${QT_TOOLCHAIN_TARGET} \ ${TISDK_TOOLCHAIN_BASE_TARGET} \ ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl-sdk-target','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-sdk-target','',d)} \ packagegroup-arago-tisdk-addons-sdk-target \ " -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
