summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/imx8mp-lpddr4-evk.conf1
-rw-r--r--conf/machine/imx8qxp-mek.conf2
-rw-r--r--conf/machine/imx93-9x9-lpddr4-qsb.conf2
-rw-r--r--conf/machine/ls1021atwr.conf35
-rw-r--r--conf/machine/ls2080ardb.conf20
-rw-r--r--recipes-core/udev/udev-rules-qoriq.bb1
-rw-r--r--recipes-devtools/uuu/uuu-bin_1.4.243.bb8
-rw-r--r--recipes-devtools/uuu/uuu_git.bb4
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.37.0.bb1
-rw-r--r--recipes-extended/odp/odp.inc2
-rw-r--r--recipes-extended/odp/odp_git.bb1
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb12
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_6.1.bb6
-rw-r--r--recipes-kernel/linux/linux-fslc_6.1.bb4
-rw-r--r--recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch27
-rw-r--r--recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch37
-rw-r--r--recipes-kernel/linux/linux-imx_6.1.bb10
-rw-r--r--recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch408
-rw-r--r--recipes-support/opencv/opencv_4.6.0.imx.bb4
19 files changed, 431 insertions, 154 deletions
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 39108716..0a50040a 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -42,6 +42,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
42 freescale/imx8mp-evk-rpmsg.dtb \ 42 freescale/imx8mp-evk-rpmsg.dtb \
43 freescale/imx8mp-evk-rpmsg-lpv.dtb \ 43 freescale/imx8mp-evk-rpmsg-lpv.dtb \
44 freescale/imx8mp-evk-sof-wm8960.dtb \ 44 freescale/imx8mp-evk-sof-wm8960.dtb \
45 freescale/imx8mp-evk-sof-pdm.dtb \
45 freescale/imx8mp-evk-spdif-lb.dtb \ 46 freescale/imx8mp-evk-spdif-lb.dtb \
46 freescale/imx8mp-evk-usdhc1-m2.dtb \ 47 freescale/imx8mp-evk-usdhc1-m2.dtb \
47 freescale/imx8mp-evk-8mic-swpdm.dtb \ 48 freescale/imx8mp-evk-8mic-swpdm.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 877ac55f..72867a95 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -16,6 +16,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
16 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199.dtb \ 16 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199.dtb \
17 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199-rpmsg.dtb \ 17 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199-rpmsg.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ 18 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \
19 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-sja1105.dtb \
20 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
19 freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ 21 freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
20 freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ 22 freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
21 freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ 23 freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index 01843aca..f6e7f3a6 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -18,6 +18,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ 18 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
19 freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ 19 freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
20 freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ 20 freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
21 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
22 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
21" 23"
22 24
23UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" 25UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
deleted file mode 100644
index dff6767c..00000000
--- a/conf/machine/ls1021atwr.conf
+++ /dev/null
@@ -1,35 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP LS1021ATWR board
3#@SOC: ls102xa
4#@DESCRIPTION: Machine configuration for NXP QorIQ LS1 Tower System
5# Module Rev2.0 with ARM Cortex-A7 core
6#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
7
8MACHINEOVERRIDES =. "ls102xa:"
9
10require conf/machine/include/qoriq-arm.inc
11require conf/machine/include/arm/armv7a/tune-cortexa7.inc
12
13MACHINE_FEATURES += "optee"
14
15DEFAULTTUNE = "cortexa7hf-neon"
16
17UBOOT_CONFIG ??= "sdcard-ifc-secure-boot sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
18UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig"
19UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_defconfig,,u-boot-with-spl-pbl.bin"
20UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_defconfig,,u-boot-with-spl-pbl.bin"
21UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig"
22UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig"
23UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig"
24UBOOT_CONFIG[sdcard-ifc-secure-boot] = "ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
25
26QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
27
28KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
29KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
30
31KERNEL_IMAGETYPES = "zImage"
32
33UBOOT_ENTRYPOINT = "0x80008000"
34EXTRA_IMAGEDEPENDS += "rcw qe-ucode"
35USE_VT ?= "0"
diff --git a/conf/machine/ls2080ardb.conf b/conf/machine/ls2080ardb.conf
deleted file mode 100644
index 6dcc7dae..00000000
--- a/conf/machine/ls2080ardb.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP LS2080ARDB board
3#@SOC: LSCH3
4#@DESCRIPTION: Machine configuration for NXP QorIQ LS2080ARDB
5# with ARM Cortext-A57 core
6#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com>
7
8MACHINEOVERRIDES =. "fsl-lsch3:ls2080a:"
9
10require conf/machine/include/qoriq-arm64.inc
11require conf/machine/include/arm/arch-armv8a.inc
12
13UBOOT_CONFIG ??= "nor"
14UBOOT_CONFIG[nor] = "ls2080ardb_defconfig"
15
16KERNEL_DEVICETREE ?= "freescale/fsl-ls2080a-rdb.dtb"
17KERNEL_DEFCONFIG ?= "defconfig"
18
19EXTRA_IMAGEDEPENDS += "ls2-phy rcw management-complex"
20USE_VT = "0"
diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb
index 525e642e..1200527c 100644
--- a/recipes-core/udev/udev-rules-qoriq.bb
+++ b/recipes-core/udev/udev-rules-qoriq.bb
@@ -22,7 +22,6 @@ RULE:ls1046a = "73-fsl-dpaa-persistent-networking.rules \
22 74-ls1046a-xfi2-networking.rules \ 22 74-ls1046a-xfi2-networking.rules \
23" 23"
24RULE:ls1012a = "" 24RULE:ls1012a = ""
25RULE:ls2080a = ""
26 25
27do_install () { 26do_install () {
28 install -d ${D}${sysconfdir}/udev/rules.d/ 27 install -d ${D}${sysconfdir}/udev/rules.d/
diff --git a/recipes-devtools/uuu/uuu-bin_1.4.243.bb b/recipes-devtools/uuu/uuu-bin_1.4.243.bb
index 76596b2c..4ad823aa 100644
--- a/recipes-devtools/uuu/uuu-bin_1.4.243.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.4.243.bb
@@ -3,16 +3,16 @@
3 3
4SUMMARY = "Universal Update Utility - Binaries" 4SUMMARY = "Universal Update Utility - Binaries"
5DESCRIPTION = "Image deploy tool for i.MX chips" 5DESCRIPTION = "Image deploy tool for i.MX chips"
6HOMEPAGE = "https://github.com/NXPmicro/mfgtools" 6HOMEPAGE = "https://github.com/nxp-imx/mfgtools"
7 7
8LICENSE = "BSD-3-Clause & LGPL-2.1-or-later" 8LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
9LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ 9LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
10 file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68" 10 file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68"
11 11
12SRC_URI = " \ 12SRC_URI = " \
13 https://github.com/NXPmicro/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \ 13 https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \
14 https://github.com/NXPmicro/mfgtools/releases/download/uuu_${PV}/uuu_mac;downloadfilename=uuu-${PV}_mac;name=Mac \ 14 https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac;downloadfilename=uuu-${PV}_mac;name=Mac \
15 https://github.com/NXPmicro/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \ 15 https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \
16" 16"
17 17
18SRC_URI[Linux.sha256sum] = "dfb2a6dca337ebd59675ea5ce7f1bce6724e3b901bcb455126d4bf9bdfa2e585" 18SRC_URI[Linux.sha256sum] = "dfb2a6dca337ebd59675ea5ce7f1bce6724e3b901bcb455126d4bf9bdfa2e585"
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index 2ff0ee5b..29a443be 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -1,8 +1,8 @@
1SUMMARY = "Universal Update Utility" 1SUMMARY = "Universal Update Utility"
2DESCRIPTION = "Image deploy tool for i.MX chips" 2DESCRIPTION = "Image deploy tool for i.MX chips"
3HOMEPAGE = "https://github.com/NXPmicro/mfgtools" 3HOMEPAGE = "https://github.com/nxp-imx/mfgtools"
4 4
5SRC_URI = "git://github.com/NXPmicro/mfgtools.git;protocol=https;branch=master" 5SRC_URI = "git://github.com/nxp-imx/mfgtools.git;protocol=https;branch=master"
6SRCREV = "ed48c514ee4c1ea4562c875877b180a87474f895" 6SRCREV = "ed48c514ee4c1ea4562c875877b180a87474f895"
7PV = "1.4.243" 7PV = "1.4.243"
8 8
diff --git a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb b/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
index c683654f..d1877159 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.37.0.bb
@@ -12,7 +12,6 @@ SRCREV = "bb19f586b87b97878b4bd0d3e57da2ca40c5c69f"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14REGLEX:ls2088a = "ls2088a" 14REGLEX:ls2088a = "ls2088a"
15REGLEX:ls2080a = "ls2080a"
16REGLEX:ls1088a = "ls1088a" 15REGLEX:ls1088a = "ls1088a"
17REGLEX:lx2160a = "lx216xa" 16REGLEX:lx2160a = "lx216xa"
18REGLEX:lx2162a = "lx216xa" 17REGLEX:lx2162a = "lx216xa"
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 88b67e6d..de9fe673 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -23,4 +23,4 @@ SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d"
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
25 25
26COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a|ls1088a)" 26COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1088a)"
diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb
index 9c94e432..7d6600d0 100644
--- a/recipes-extended/odp/odp_git.bb
+++ b/recipes-extended/odp/odp_git.bb
@@ -15,7 +15,6 @@ ODP_PLATFORM ?= "linux-dpaa2"
15ODP_BUILD_TYPE ?= "ls2088" 15ODP_BUILD_TYPE ?= "ls2088"
16ODP_BUILD_TYPE:ls1043ardb = "ls1043" 16ODP_BUILD_TYPE:ls1043ardb = "ls1043"
17ODP_BUILD_TYPE:ls1046ardb = "ls1046" 17ODP_BUILD_TYPE:ls1046ardb = "ls1046"
18ODP_BUILD_TYPE:ls2080ardb = "ls2080"
19ODP_BUILD_TYPE:ls1088ardb = "ls1088" 18ODP_BUILD_TYPE:ls1088ardb = "ls1088"
20 19
21EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \ 20EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \
diff --git a/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb b/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb
deleted file mode 100644
index 25b9f7f5..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1SUMMARY = "Scatter-gather logic for multiple tables"
2LICENSE = "GPL-2.0-or-later"
3LIC_FILES_CHKSUM = "file://COPYING;md5=e9605a22ea50467bd2bfe4cdd66e69ae"
4
5inherit module
6
7SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/scatter-gather;branch=nxp/master;protocol=https"
8SRCREV = "97db173d08a70abe2b9a6fa928299a117f3febc2"
9
10S = "${WORKDIR}/git"
11
12COMPATIBLE_MACHINE = "(ls1021a)"
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
index 1dcb1f91..38bc0b97 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
@@ -52,16 +52,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
52 52
53require linux-imx.inc 53require linux-imx.inc
54 54
55KBRANCH = "6.1-2.0.x-imx" 55KBRANCH = "6.1-2.1.x-imx"
56SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" 56SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
57SRCREV = "b872b1170fc8843b55e9f8838dd373ff43bb7552" 57SRCREV = "3f41fbe42851375d3d5996e4bf9e9809e6c79517"
58 58
59# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 59# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
60# required by kernel-yocto.bbclass. 60# required by kernel-yocto.bbclass.
61# 61#
62# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 62# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
63# should be updated once patchlevel is merged. 63# should be updated once patchlevel is merged.
64LINUX_VERSION = "6.1.38" 64LINUX_VERSION = "6.1.57"
65 65
66KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 66KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
67KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 67KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc_6.1.bb b/recipes-kernel/linux/linux-fslc_6.1.bb
index 4ae8b9b6..ecdc3c88 100644
--- a/recipes-kernel/linux/linux-fslc_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc_6.1.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
19# 19#
20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
21# should be updated once patchlevel is merged. 21# should be updated once patchlevel is merged.
22LINUX_VERSION = "6.1.38" 22LINUX_VERSION = "6.1.57"
23 23
24KBRANCH = "6.1.x+fslc" 24KBRANCH = "6.1.x+fslc"
25SRCREV = "085682f3fc7ed71fdafa987c96d76805086336a9" 25SRCREV = "2c0a3c104b3104e0244b32ac25151f699ac960c3"
26 26
27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
28KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 28KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch b/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch
deleted file mode 100644
index 59490768..00000000
--- a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 23 May 2023 13:16:05 -0300
4Subject: [PATCH] ARM: imx_v7_defconfig: Remove KERNEL_LZO config
5
6The KERNEL_GZIP is used in most config and is the default, there is no
7clear reason to diverge so let default be used.
8
9Upstream-Status: Pending
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 arch/arm/configs/imx_v7_defconfig | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
17index 6de3049689191..94e9457e2bab1 100644
18--- a/arch/arm/configs/imx_v7_defconfig
19+++ b/arch/arm/configs/imx_v7_defconfig
20@@ -1,4 +1,3 @@
21-CONFIG_KERNEL_LZO=y
22 CONFIG_SYSVIPC=y
23 CONFIG_POSIX_MQUEUE=y
24 CONFIG_NO_HZ=y
25--
262.40.1
27
diff --git a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch b/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch
deleted file mode 100644
index a917a243..00000000
--- a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 168e36d8879e3f5c4cf57ed74c10f6c134e45638 Mon Sep 17 00:00:00 2001
2From: Daiane Angolini <daiane.angolini@foundries.io>
3Date: Tue, 25 Jul 2023 10:54:45 -0300
4Subject: [PATCH] drivers:mxc-gpu-viv: Fix enum-int-mismatch warning
5
6Fix the warning (treated as error):
7
8ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch]
9| 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal)
10| | ^~~~~~~~~~~~
11| In file included from /(...)tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56:
12| /(...)/buildw/tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:341:1: note: previous declaration of '_QuerySignal' with type 'gctBOOL(struct _gckOS *, void *)' {aka 'int(struct _gckOS *, void *)'}
13| 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal);
14| | ^~~~~~~~~~~~
15| cc1: all warnings being treated as errors
16
17Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
18---
19 drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
23index 61edf03571443..b4c1cbf414846 100644
24--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
25+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
26@@ -337,7 +337,7 @@ _ConvertLogical2Physical(IN gckOS Os,
27 IN PLINUX_MDL Mdl,
28 OUT gctPHYS_ADDR_T *Physical);
29
30-gctBOOL
31+gceSTATUS
32 _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal);
33
34 static inline gctINT
35--
362.34.1
37
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb
index 574ba04d..f8a9ce1d 100644
--- a/recipes-kernel/linux/linux-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-imx_6.1.bb
@@ -12,20 +12,16 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
12 12
13require recipes-kernel/linux/linux-imx.inc 13require recipes-kernel/linux/linux-imx.inc
14 14
15SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \
16 file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \
17 "
18
19SRCBRANCH = "lf-6.1.y" 15SRCBRANCH = "lf-6.1.y"
20LOCALVERSION = "-6.1.22-2.0.0" 16LOCALVERSION = "-6.1.36-2.1.0"
21SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67" 17SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3"
22 18
23# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 19# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
24# required by kernel-yocto.bbclass. 20# required by kernel-yocto.bbclass.
25# 21#
26# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 22# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
27# should be updated once patchlevel is merged. 23# should be updated once patchlevel is merged.
28LINUX_VERSION = "6.1.22" 24LINUX_VERSION = "6.1.36"
29 25
30KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 26KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
31KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 27KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
new file mode 100644
index 00000000..3538f24b
--- /dev/null
+++ b/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
@@ -0,0 +1,408 @@
1From 5e4150826fea6f37276f348c65d94ce4847d1211 Mon Sep 17 00:00:00 2001
2From: Kumataro <Kumataro@users.noreply.github.com>
3Date: Sat, 7 Oct 2023 10:11:25 +0900
4Subject: [PATCH] 3rdparty: supporting protobuf v22 and later
5
6Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/24372]
7---
8 cmake/OpenCVFindProtobuf.cmake | 37 ++++++++++++++++++++++++++++++++++
9 modules/dnn/CMakeLists.txt | 9 +++++++++
10 2 files changed, 46 insertions(+)
11
12diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
13index 8835347d1d..9bd5c28db8 100644
14--- a/cmake/OpenCVFindProtobuf.cmake
15+++ b/cmake/OpenCVFindProtobuf.cmake
16@@ -67,6 +67,38 @@ else()
17 endif()
18 endif()
19
20+# See https://github.com/opencv/opencv/issues/24369
21+# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp.
22+# Details: https://protobuf.dev/news/2022-08-03/
23+# And if std::text_view is in abseil-cpp requests C++17 and later.
24+if(HAVE_PROTOBUF)
25+ if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]])
26+ string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL)
27+
28+ if(REQUEST_ABSL)
29+ string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17)
30+ if(NOT USED_AFTER_CXX17)
31+ message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
32+ message("protobuf : ${Protobuf_VERSION}")
33+ message(FATAL_ERROR "protobuf(v22 and later) and abseil-cpp request CMAKE_CXX_STANDARD=17 and later.")
34+ endif()
35+
36+ ocv_check_modules(ABSL_STRINGS absl_strings)
37+ if(NOT ABSL_STRINGS_FOUND)
38+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(strings), but missing.")
39+ endif()
40+
41+ ocv_check_modules(ABSL_LOG absl_log)
42+ if(NOT ABSL_LOG_FOUND)
43+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(log), but missing.")
44+ endif()
45+
46+ endif()
47+ else()
48+ message(FATAL_ERROR "Protobuf version(${Protobuf_VERSION}) is unexpected to split.")
49+ endif()
50+endif()
51+
52 if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP)
53 message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
54 endif()
55@@ -89,3 +121,8 @@ if(HAVE_PROTOBUF)
56 BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
57 ELSE "${__location} (${Protobuf_VERSION})")
58 endif()
59+
60+if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG)
61+ list(APPEND CUSTOM_STATUS absl)
62+ list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" )
63+endif()
64diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
65index 804b78ead2..d32007b37e 100644
66--- a/modules/dnn/CMakeLists.txt
67+++ b/modules/dnn/CMakeLists.txt
68@@ -149,6 +149,15 @@ if(NOT BUILD_PROTOBUF)
69 list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS})
70 endif()
71
72+if(HAVE_ABSL_STRINGS)
73+ list(APPEND libs ${ABSL_STRINGS_LIBRARIES})
74+ list(APPEND include_dirs ${ABSL_STRTRINGS_INCLUDE_DIRS})
75+endif()
76+if(HAVE_ABSL_LOG)
77+ list(APPEND libs ${ABSL_LOG_LIBRARIES})
78+ list(APPEND include_dirs ${ABSL_LOG_INCLUDE_DIRS})
79+endif()
80+
81 set(sources_options "")
82
83 list(APPEND libs ${LAPACK_LIBRARIES})
84From 06a7669521d205f647d3e718322ccd153cdbbb77 Mon Sep 17 00:00:00 2001
85From: Kumataro <Kumataro@users.noreply.github.com>
86Date: Sun, 8 Oct 2023 09:39:35 +0900
87Subject: [PATCH] dnn: disable some tests for external protobuf
88
89---
90 modules/dnn/CMakeLists.txt | 5 +++++
91 modules/dnn/src/caffe/caffe_io.cpp | 24 ++++++++++++++++++++++--
92 modules/dnn/test/test_layers.cpp | 16 ++++++++++++++++
93 3 files changed, 43 insertions(+), 2 deletions(-)
94
95diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
96index d32007b37e..face38465f 100644
97--- a/modules/dnn/CMakeLists.txt
98+++ b/modules/dnn/CMakeLists.txt
99@@ -254,6 +254,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs})
100 ocv_add_samples()
101 ocv_add_accuracy_tests(${dnn_runtime_libs})
102
103+if(NOT BUILD_PROTOBUF)
104+ if(TARGET opencv_test_dnn)
105+ ocv_target_compile_definitions(opencv_test_dnn PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1")
106+ endif()
107+endif()
108+
109 set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf")
110 file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp")
111 file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h")
112
113diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
114index ebecf95eea..ebceca84cf 100644
115--- a/modules/dnn/src/caffe/caffe_io.cpp
116+++ b/modules/dnn/src/caffe/caffe_io.cpp
117@@ -1130,7 +1130,17 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
118 parser.AllowUnknownField(true);
119 parser.SetRecursionLimit(1000);
120 #endif
121- return parser.Parse(&input, proto);
122+ const bool ret = parser.Parse(&input, proto);
123+
124+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
125+ if(!ret)
126+ {
127+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
128+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
129+ }
130+#endif
131+
132+ return ret;
133 }
134
135 bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
136@@ -1148,7 +1158,17 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
137 parser.AllowUnknownField(true);
138 parser.SetRecursionLimit(1000);
139 #endif
140- return parser.Parse(&input, proto);
141+ const bool ret = parser.Parse(&input, proto);
142+
143+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
144+ if(!ret)
145+ {
146+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
147+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
148+ }
149+#endif
150+
151+ return ret;
152 }
153
154
155diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
156index 763d94b99c..a07d442d76 100644
157--- a/modules/dnn/test/test_layers.cpp
158+++ b/modules/dnn/test/test_layers.cpp
159@@ -754,7 +754,11 @@ TEST_F(Layer_RNN_Test, get_set_test)
160 EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH));
161 }
162
163+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
164 TEST_P(Test_Caffe_layers, Accum)
165+#else
166+TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only)
167+#endif
168 {
169 if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU)
170 applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
171@@ -778,7 +782,11 @@ TEST_P(Test_Caffe_layers, ChannelNorm)
172 testLayerUsingCaffeModels("channel_norm", false, false);
173 }
174
175+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
176 TEST_P(Test_Caffe_layers, DataAugmentation)
177+#else
178+TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only)
179+#endif
180 {
181 if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
182 applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
183@@ -787,7 +795,11 @@ TEST_P(Test_Caffe_layers, DataAugmentation)
184 testLayerUsingCaffeModels("data_augmentation_8x6", true, false);
185 }
186
187+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
188 TEST_P(Test_Caffe_layers, Resample)
189+#else
190+TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only)
191+#endif
192 {
193 if (backend != DNN_BACKEND_OPENCV)
194 applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);
195@@ -795,7 +807,11 @@ TEST_P(Test_Caffe_layers, Resample)
196 testLayerUsingCaffeModels("nearest", false, false);
197 }
198
199+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
200 TEST_P(Test_Caffe_layers, Correlation)
201+#else
202+TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only)
203+#endif
204 {
205 if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
206 applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER,
207From 2c33798f41942aefc203183d673ce4846f32dba4 Mon Sep 17 00:00:00 2001
208From: Kumataro <Kumataro@users.noreply.github.com>
209Date: Sun, 8 Oct 2023 13:28:40 +0900
210Subject: [PATCH] use GREATER instead of GREATER_EQUAL and remove new blank
211 line at EOF
212
213---
214 cmake/OpenCVFindProtobuf.cmake | 6 ++++--
215 1 file changed, 4 insertions(+), 2 deletions(-)
216
217diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
218index 9bd5c28db8..ba147526d6 100644
219--- a/cmake/OpenCVFindProtobuf.cmake
220+++ b/cmake/OpenCVFindProtobuf.cmake
221@@ -71,12 +71,14 @@ endif()
222 # In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp.
223 # Details: https://protobuf.dev/news/2022-08-03/
224 # And if std::text_view is in abseil-cpp requests C++17 and later.
225+
226 if(HAVE_PROTOBUF)
227 if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]])
228- string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL)
229+ string(COMPARE GREATER "${CMAKE_MATCH_1}" "21" REQUEST_ABSL) # >=22
230
231 if(REQUEST_ABSL)
232- string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17)
233+ string(COMPARE GREATER "${CMAKE_CXX_STANDARD}" "16" USED_AFTER_CXX17) # >=17
234+
235 if(NOT USED_AFTER_CXX17)
236 message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
237 message("protobuf : ${Protobuf_VERSION}")
238From cd709eefbeedd116bf3495b42280323b932791ff Mon Sep 17 00:00:00 2001
239From: Kumataro <Kumataro@users.noreply.github.com>
240Date: Mon, 9 Oct 2023 21:51:04 +0900
241Subject: [PATCH] fix for review
242
243---
244 cmake/OpenCVFindProtobuf.cmake | 5 ----
245 modules/dnn/src/caffe/caffe_io.cpp | 24 ++----------------
246 modules/dnn/test/test_layers.cpp | 40 +++++++++++++++---------------
247 3 files changed, 22 insertions(+), 47 deletions(-)
248
249diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
250index ba147526d6..2faf1010bf 100644
251--- a/cmake/OpenCVFindProtobuf.cmake
252+++ b/cmake/OpenCVFindProtobuf.cmake
253@@ -123,8 +123,3 @@ if(HAVE_PROTOBUF)
254 BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
255 ELSE "${__location} (${Protobuf_VERSION})")
256 endif()
257-
258-if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG)
259- list(APPEND CUSTOM_STATUS absl)
260- list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" )
261-endif()
262diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
263index ebceca84cf..ebecf95eea 100644
264--- a/modules/dnn/src/caffe/caffe_io.cpp
265+++ b/modules/dnn/src/caffe/caffe_io.cpp
266@@ -1130,17 +1130,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
267 parser.AllowUnknownField(true);
268 parser.SetRecursionLimit(1000);
269 #endif
270- const bool ret = parser.Parse(&input, proto);
271-
272-#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
273- if(!ret)
274- {
275- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
276- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
277- }
278-#endif
279-
280- return ret;
281+ return parser.Parse(&input, proto);
282 }
283
284 bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
285@@ -1158,17 +1148,7 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
286 parser.AllowUnknownField(true);
287 parser.SetRecursionLimit(1000);
288 #endif
289- const bool ret = parser.Parse(&input, proto);
290-
291-#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
292- if(!ret)
293- {
294- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
295- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
296- }
297-#endif
298-
299- return ret;
300+ return parser.Parse(&input, proto);
301 }
302
303
304diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
305index a07d442d76..5c6fc541d7 100644
306--- a/modules/dnn/test/test_layers.cpp
307+++ b/modules/dnn/test/test_layers.cpp
308@@ -754,17 +754,17 @@ TEST_F(Layer_RNN_Test, get_set_test)
309 EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH));
310 }
311
312-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
313 TEST_P(Test_Caffe_layers, Accum)
314-#else
315-TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only)
316-#endif
317 {
318+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
319+ throw SkipTestException("Requires patched protobuf");
320+#else
321 if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU)
322 applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
323
324 testLayerUsingCaffeModels("accum", false, false, 0.0, 0.0, 2);
325 testLayerUsingCaffeModels("accum_ref", false, false, 0.0, 0.0, 2);
326+#endif
327 }
328
329 TEST_P(Test_Caffe_layers, FlowWarp)
330@@ -782,42 +782,42 @@ TEST_P(Test_Caffe_layers, ChannelNorm)
331 testLayerUsingCaffeModels("channel_norm", false, false);
332 }
333
334-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
335 TEST_P(Test_Caffe_layers, DataAugmentation)
336-#else
337-TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only)
338-#endif
339 {
340+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
341+ throw SkipTestException("Requires patched protobuf");
342+#else
343 if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
344 applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
345 testLayerUsingCaffeModels("data_augmentation", true, false);
346 testLayerUsingCaffeModels("data_augmentation_2x1", true, false);
347 testLayerUsingCaffeModels("data_augmentation_8x6", true, false);
348+#endif
349 }
350
351-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
352 TEST_P(Test_Caffe_layers, Resample)
353-#else
354-TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only)
355-#endif
356 {
357+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
358+ throw SkipTestException("Requires patched protobuf");
359+#else
360 if (backend != DNN_BACKEND_OPENCV)
361 applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);
362 testLayerUsingCaffeModels("nearest_2inps", false, false, 0.0, 0.0, 2);
363 testLayerUsingCaffeModels("nearest", false, false);
364+#endif
365 }
366
367-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
368 TEST_P(Test_Caffe_layers, Correlation)
369-#else
370-TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only)
371-#endif
372 {
373+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
374+ throw SkipTestException("Requires patched protobuf");
375+#else
376 if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
377 applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER,
378 CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
379 testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2);
380 }
381+#endif
382
383 TEST_P(Test_Caffe_layers, Convolution2Inputs)
384 {
385@@ -1644,12 +1644,11 @@ private:
386 int outWidth, outHeight, zoomFactor;
387 };
388
389-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
390 TEST_P(Test_Caffe_layers, Interp)
391-#else
392-TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (available in OpenCV source tree only)
393-#endif
394 {
395+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
396+ throw SkipTestException("Requires patched protobuf");
397+#else
398 #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2022010000)
399 // Cannot get memory!
400 if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_CPU)
401@@ -1686,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa
402
403 // Test an implemented layer.
404 testLayerUsingCaffeModels("layer_interp", false, false);
405+#endif
406 }
407
408 INSTANTIATE_TEST_CASE_P(/*nothing*/, Test_Caffe_layers, dnnBackendsAndTargets());
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index efb29c16..6d13d107 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -4,6 +4,7 @@
4 4
5########## meta-openembedded copy ########### 5########## meta-openembedded copy ###########
6# Upstream hash: 72dc42966be7da07f9553f75b825123b81704f0b 6# Upstream hash: 72dc42966be7da07f9553f75b825123b81704f0b
7# Commit https://github.com/openembedded/meta-openembedded/commit/225ce6a14a8110ab6b573b4dc9f5297a03d17e0f added
7 8
8SUMMARY = "Opencv : The Open Computer Vision Library" 9SUMMARY = "Opencv : The Open Computer Vision Library"
9HOMEPAGE = "http://opencv.org/" 10HOMEPAGE = "http://opencv.org/"
@@ -59,6 +60,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol
59 file://download.patch \ 60 file://download.patch \
60 file://0001-Make-ts-module-external.patch \ 61 file://0001-Make-ts-module-external.patch \
61 file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ 62 file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \
63 file://fix-build-with-protobuf-v22.patch \
62 " 64 "
63SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" 65SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
64 66
@@ -128,7 +130,7 @@ PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb"
128PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" 130PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
129PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," 131PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
130PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," 132PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
131PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," 133PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
132PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," 134PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
133PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," 135PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype,"
134PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," 136PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-25 01:09:55 +0000