diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 3 | ||||
-rw-r--r-- | recipes-graphics/wayland/wayland-protocols_1.25.imx.bb | 2 | ||||
-rw-r--r-- | recipes-support/opencv/opencv_4.6.0.imx.bb | 19 |
3 files changed, 14 insertions, 10 deletions
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" | |||
527 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" | 527 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" |
528 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" | 528 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" |
529 | 529 | ||
530 | #Use i.MX opencv Version for mx8 | 530 | # Use i.MX opencv Version |
531 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" | 531 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
532 | PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" | ||
532 | 533 | ||
533 | # Handle default kernel | 534 | # Handle default kernel |
534 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" | 535 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" |
diff --git a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb index 654f8660..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}" | |||
25 | FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" | 25 | FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" |
26 | 26 | ||
27 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 27 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
28 | COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" | 28 | COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" |
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 += " \ | |||
276 | file://OpenCV_DNN_examples.patch \ | 276 | file://OpenCV_DNN_examples.patch \ |
277 | " | 277 | " |
278 | 278 | ||
279 | PACKAGECONFIG:remove = "eigen" | 279 | PACKAGECONFIG:remove = "eigen" |
280 | PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text" | 280 | |
281 | PACKAGECONFIG_OPENCL = "" | 281 | PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text" |
282 | PACKAGECONFIG_OPENCL:mx8-nxp-bsp = "opencl" | 282 | PACKAGECONFIG:append:mx9-nxp-bsp = " dnn text" |
283 | PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp = "" | 283 | |
284 | PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = "" | 284 | PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" |
285 | PACKAGECONFIG_OPENCL = "" | ||
286 | PACKAGECONFIG_OPENCL:mx8-nxp-bsp = "opencl" | ||
287 | PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp = "" | ||
288 | PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = "" | ||
285 | PACKAGECONFIG_OPENCL:mx8mnlite-nxp-bsp = "" | 289 | PACKAGECONFIG_OPENCL:mx8mnlite-nxp-bsp = "" |
286 | PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" | ||
287 | 290 | ||
288 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," | 291 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," |
289 | 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," | 292 | 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() { | |||
308 | 311 | ||
309 | FILES:${PN}-samples += "${datadir}/OpenCV/samples" | 312 | FILES:${PN}-samples += "${datadir}/OpenCV/samples" |
310 | 313 | ||
311 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | 314 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)" |
312 | 315 | ||
313 | ########## End of i.MX overrides ########## | 316 | ########## End of i.MX overrides ########## |