From b430b7aa4136d36cab10298570cafada3bd4cb21 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 17 Feb 2023 09:47:44 -0700 Subject: imx-base.inc: Use OpenCV fork for i.MX 93, NXP BSP Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index e59c5bee..5d1cd1cb 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -527,8 +527,9 @@ PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" -#Use i.MX opencv Version for mx8 +# Use i.MX opencv Version PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" +PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" # Handle default kernel IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" -- cgit v1.2.3-54-g00ecf From 575f7896da6bc194699e4e25cf9185a87897ba0d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 17 Feb 2023 11:10:25 -0700 Subject: opencv: Add support for i.MX 9 Signed-off-by: Tom Hochstein --- recipes-support/opencv/opencv_4.6.0.imx.bb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb index e3f03379..16cc2643 100644 --- a/recipes-support/opencv/opencv_4.6.0.imx.bb +++ b/recipes-support/opencv/opencv_4.6.0.imx.bb @@ -276,14 +276,17 @@ SRC_URI += " \ file://OpenCV_DNN_examples.patch \ " -PACKAGECONFIG:remove = "eigen" -PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text" -PACKAGECONFIG_OPENCL = "" -PACKAGECONFIG_OPENCL:mx8-nxp-bsp = "opencl" -PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp = "" -PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = "" +PACKAGECONFIG:remove = "eigen" + +PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text" +PACKAGECONFIG:append:mx9-nxp-bsp = " dnn text" + +PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" +PACKAGECONFIG_OPENCL = "" +PACKAGECONFIG_OPENCL:mx8-nxp-bsp = "opencl" +PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp = "" +PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = "" PACKAGECONFIG_OPENCL:mx8mnlite-nxp-bsp = "" -PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," @@ -308,6 +311,6 @@ do_install:append() { FILES:${PN}-samples += "${datadir}/OpenCV/samples" -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" +COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)" ########## End of i.MX overrides ########## -- cgit v1.2.3-54-g00ecf From c54c8ad851f78f7b183e2175d1c9ba0179ddfc48 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 17 Feb 2023 12:02:18 -0700 Subject: wayland-protocols: Simplify compatibility logic The recipe is for all i.MX 6-8 SOCs using NXP BSP, but it confusingly uses an indirect override imxfbdev|imxgpu. The override used does happen to cover all 6-8, but it is simpler to just use i.MX series overrides. Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/wayland-protocols_1.25.imx.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb index 654f8660..3ac7268b 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb @@ -25,4 +25,4 @@ PACKAGES = "${PN}" FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 6a5b0e2e17bccd3521234355d526d56a1ba51a5b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 17 Feb 2023 12:05:08 -0700 Subject: wayland-protocols: Add i.MX 9 series compatibility for NXP BSP Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/wayland-protocols_1.25.imx.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb index 3ac7268b..b31267c1 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb @@ -25,4 +25,4 @@ PACKAGES = "${PN}" FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" -- cgit v1.2.3-54-g00ecf