diff options
3 files changed, 33 insertions, 89 deletions
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch deleted file mode 100644 index 8d9610d5..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 5bfb24738c47003fd04a86bfd5a49f8c6354ed23 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
3 | Date: Fri, 28 Aug 2020 07:46:35 +0000 | ||
4 | Subject: [PATCH] decoder_sw: resolve compilation error with -fcommon | ||
5 | |||
6 | -fcommon is enabled by default in gcc10 compiler, which results in | ||
7 | following build errors: | ||
8 | |||
9 | decoder_sw/software/source/inc/decapicommon.h:272: multiple definition | ||
10 | of `DecPicCodingType'; decoder_sw/software/linux/dwl/dwl_linux.o: | ||
11 | decoder_sw/software/source/inc/decapicommon.h:272: first defined here | ||
12 | |||
13 | decoder_sw/software/source/inc/dwl.h:94: multiple definition of | ||
14 | `DWLInitParam'; decoder_sw/software/linux/dwl/dwl_linux.o: | ||
15 | decoder_sw/software/source/inc/dwl.h:94: first defined here | ||
16 | |||
17 | Drop multiple enum name definitions, which solves above compilation | ||
18 | issues. | ||
19 | |||
20 | Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
21 | --- | ||
22 | decoder_sw/software/source/inc/decapicommon.h | 2 +- | ||
23 | decoder_sw/software/source/inc/dwl.h | 2 +- | ||
24 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/decoder_sw/software/source/inc/decapicommon.h b/decoder_sw/software/source/inc/decapicommon.h | ||
27 | index 0f02092..fc8cccf 100755 | ||
28 | --- a/decoder_sw/software/source/inc/decapicommon.h | ||
29 | +++ b/decoder_sw/software/source/inc/decapicommon.h | ||
30 | @@ -269,7 +269,7 @@ enum DecPicCodingType { | ||
31 | DEC_PIC_TYPE_D = 3, | ||
32 | DEC_PIC_TYPE_FI = 4, | ||
33 | DEC_PIC_TYPE_BI = 5 | ||
34 | -} DecPicCodingType; | ||
35 | +}; | ||
36 | |||
37 | /* Output picture pixel format types for raster scan or down scale output */ | ||
38 | enum DecPicturePixelFormat { | ||
39 | diff --git a/decoder_sw/software/source/inc/dwl.h b/decoder_sw/software/source/inc/dwl.h | ||
40 | index 6991f03..fd357b3 100755 | ||
41 | --- a/decoder_sw/software/source/inc/dwl.h | ||
42 | +++ b/decoder_sw/software/source/inc/dwl.h | ||
43 | @@ -91,7 +91,7 @@ struct DWLLinearMem { | ||
44 | /* DWLInitParam is used to pass parameters when initializing the DWL */ | ||
45 | struct DWLInitParam { | ||
46 | u32 client_type; | ||
47 | -} DWLInitParam; | ||
48 | +}; | ||
49 | |||
50 | /* Hardware configuration description, same as in top API */ | ||
51 | typedef struct DecHwConfig DWLHwConfig; | ||
52 | -- | ||
53 | 2.17.1 | ||
54 | |||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb deleted file mode 100644 index b7c64cbb..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | # Copyright (C) 2017-2020 NXP | ||
2 | |||
3 | DESCRIPTION = "i.MX Hantro VPU library" | ||
4 | LICENSE = "Proprietary" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" | ||
6 | |||
7 | PROVIDES = "virtual/imxvpu" | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ | ||
11 | " | ||
12 | SRC_URI[md5sum] = "682b3a73bf5aa22a37d56a433d11fc91" | ||
13 | SRC_URI[sha256sum] = "e6cdd5b4c628604906466fc9620e2b048cf1b2c863f9ee49616dd5212b9261b0" | ||
14 | |||
15 | inherit fsl-eula-unpack use-imx-headers | ||
16 | |||
17 | PARALLEL_MAKE="-j 1" | ||
18 | |||
19 | PLATFORM_mx8mm = "IMX8MM" | ||
20 | PLATFORM_mx8mq = "IMX8MQ" | ||
21 | PLATFORM_mx8mp = "IMX8MP" | ||
22 | |||
23 | do_compile () { | ||
24 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" \ | ||
25 | SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ | ||
26 | PLATFORM="${PLATFORM}" all | ||
27 | } | ||
28 | |||
29 | do_install () { | ||
30 | oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += "/unit_tests" | ||
34 | |||
35 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" | ||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb new file mode 100644 index 00000000..6bac0e46 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | # Copyright (C) 2017-2020 NXP | ||
2 | |||
3 | DESCRIPTION = "i.MX Hantro VPU library" | ||
4 | LICENSE = "Proprietary" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" | ||
6 | |||
7 | PROVIDES = "virtual/imxvpu" | ||
8 | |||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | ||
10 | SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1" | ||
11 | SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00" | ||
12 | |||
13 | inherit fsl-eula-unpack use-imx-headers | ||
14 | |||
15 | PARALLEL_MAKE="-j 1" | ||
16 | |||
17 | PLATFORM_mx8mm = "IMX8MM" | ||
18 | PLATFORM_mx8mq = "IMX8MQ" | ||
19 | PLATFORM_mx8mp = "IMX8MP" | ||
20 | |||
21 | EXTRA_OEMAKE = " \ | ||
22 | CROSS_COMPILE="${HOST_PREFIX}" \ | ||
23 | SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ | ||
24 | PLATFORM="${PLATFORM}" \ | ||
25 | " | ||
26 | |||
27 | do_install () { | ||
28 | oe_runmake install DEST_DIR="${D}" | ||
29 | } | ||
30 | |||
31 | FILES_${PN} += "/unit_tests" | ||
32 | |||
33 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" | ||