summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb (renamed from recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb)8
-rw-r--r--recipes-bsp/imx-seco/imx-seco-libs_git.bb8
-rw-r--r--recipes-bsp/imx-seco/imx-seco_3.8.1.bb (renamed from recipes-bsp/imx-seco/imx-seco_3.7.5.bb)8
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb6
-rw-r--r--recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb (renamed from recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb)8
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch33
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb32
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch54
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb35
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb35
10 files changed, 119 insertions, 108 deletions
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb
index bd69f6ea..b8c3d3c3 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2016 Freescale Semiconductor 1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright (C) 2017-2020 NXP 2# Copyright (C) 2017-2021 NXP
3 3
4DESCRIPTION = "i.MX System Controller Firmware" 4DESCRIPTION = "i.MX System Controller Firmware"
5LICENSE = "Proprietary" 5LICENSE = "Proprietary"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
7SECTION = "BSP" 7SECTION = "BSP"
8 8
9inherit fsl-eula-unpack pkgconfig deploy 9inherit fsl-eula-unpack pkgconfig deploy
10 10
11SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" 11SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
12 12
13SRC_URI[md5sum] = "962aebbb0100cc0e049fa88cea594a00" 13SRC_URI[md5sum] = "5fb6fd285b18717614b5ba67f023e51c"
14SRC_URI[sha256sum] = "9a37353c07c187078be02d76ac55f615cd0c60ea9a1c4233c1929e4b2c43aebc" 14SRC_URI[sha256sum] = "df0fe17c93e4c2835542d6b1b2557524f034e378b643100cd838225e82336158"
15 15
16BOARD_TYPE ?= "mek" 16BOARD_TYPE ?= "mek"
17SC_FIRMWARE_NAME ?= "INVALID" 17SC_FIRMWARE_NAME ?= "INVALID"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index af51529b..41128e28 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3SUMMARY = "NXP i.MX SECO library" 3SUMMARY = "NXP i.MX SECO library"
4DESCRIPTION = "NXP i.MX Security Controller library" 4DESCRIPTION = "NXP i.MX Security Controller library"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" 7LIC_FILES_CHKSUM = "file://EULA.txt;md5=85d06b38f17b935ca11784d67075b846"
8 8
9DEPENDS = "zlib" 9DEPENDS = "zlib"
10 10
11SRCBRANCH = "imx_5.4.70_2.3.1" 11SRCBRANCH = "lf-5.10.y_2.0.0"
12SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ 12SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \
13 file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" 13 file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch"
14SRCREV = "79e5fb5d096c61b1c3163c9fa8e42719509d95a0" 14SRCREV = "44caf511023012e9eda93f8bf64c90eaff1bade6"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb b/recipes-bsp/imx-seco/imx-seco_3.8.1.bb
index c3d86e7a..adbb81c4 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.8.1.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3SUMMARY = "NXP i.MX SECO firmware" 3SUMMARY = "NXP i.MX SECO firmware"
4DESCRIPTION = "NXP i.MX Security Controller firmware" 4DESCRIPTION = "NXP i.MX Security Controller firmware"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 7LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
8 8
9inherit fsl-eula-unpack use-imx-security-controller-firmware deploy 9inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
10 10
11SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" 11SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
12 12
13SRC_URI[md5sum] = "d4faca131abfc51a1dd0278d7d201159" 13SRC_URI[md5sum] = "3043817d797fbd7417442ef3709d69b3"
14SRC_URI[sha256sum] = "08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc" 14SRC_URI[sha256sum] = "fe6cff8ee0b66cc4e048ad4ad17e663867c5509809a436a3da62a73a80c1140f"
15 15
16do_compile[noexec] = "1" 16do_compile[noexec] = "1"
17 17
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 95e90e22..118590d5 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -1,6 +1,6 @@
1# Copyright (C) 2012-2016 O.S. Systems Software LTDA. 1# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
2# Copyright (C) 2013-2016 Freescale Semiconductor 2# Copyright (C) 2013-2016 Freescale Semiconductor
3# Copyright (C) 2017-2019 NXP 3# Copyright (C) 2017-2021 NXP
4 4
5SUMMARY = "Test programs for i.MX BSP" 5SUMMARY = "Test programs for i.MX BSP"
6DESCRIPTION = "Unit tests for the i.MX BSP" 6DESCRIPTION = "Unit tests for the i.MX BSP"
@@ -16,12 +16,12 @@ DEPENDS_append_imxvpu = " virtual/imxvpu"
16PE = "1" 16PE = "1"
17PV = "7.0+${SRCPV}" 17PV = "7.0+${SRCPV}"
18 18
19SRCBRANCH = "imx_5.4.70_2.3.0" 19SRCBRANCH = "lf-5.10.y_2.0.0"
20SRC_URI = " \ 20SRC_URI = " \
21 git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ 21 git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
22 file://memtool_profile \ 22 file://memtool_profile \
23" 23"
24SRCREV = "7468ce4b6477f8687e67fd03cb51b0fefa168a27" 24SRCREV = "e55c83b939dbb1989181f48b2b3f3e32f7b5b380"
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26 26
27inherit module-base use-imx-headers 27inherit module-base use-imx-headers
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb
index bd087898..58a140b4 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb
@@ -1,8 +1,8 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3DESCRIPTION = "i.MX VC8000E Encoder library" 3DESCRIPTION = "i.MX VC8000E Encoder library"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6 6
7inherit fsl-eula-unpack 7inherit fsl-eula-unpack
8 8
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
10 10
11S = "${WORKDIR}/${BPN}-${PV}" 11S = "${WORKDIR}/${BPN}-${PV}"
12 12
13SRC_URI[md5sum] = "37c61718602ff08041b81319cfd6a8d9" 13SRC_URI[md5sum] = "b5270450ba2da5b7468b67ae8c0bcdca"
14SRC_URI[sha256sum] = "8425796fc63d7107f2f57c51497281c4d54c883b2670817347fbe55f39dc2b8c" 14SRC_URI[sha256sum] = "d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3"
15 15
16# SCR is the location and name of the Software Content Register file 16# SCR is the location and name of the Software Content Register file
17# relative to ${D}${D_SUBDIR}. 17# relative to ${D}${D_SUBDIR}.
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
new file mode 100644
index 00000000..dff2fb8f
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
@@ -0,0 +1,33 @@
1From 94ae72948f1ed1a8bad1c13b4edc4b9189207e35 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Mon, 26 Jul 2021 09:06:26 -0500
4Subject: [PATCH] Makefile: Honor LDFLAGS from toolchain
5
6The LDFLAGS variable is standard from the toolchain and should be
7honored. Yocto detects the problem with a QA check:
8
9ERROR: imx-vpu-hantro-daemon-1.1.0-r0 do_package_qa: QA Issue: File /usr/bin/vsidaemon in package imx-vpu-hantro-daemon doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
10
11Upstream-Status: Pending
12
13Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
14---
15 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile b/Makefile
19index 9a775b0..e73ff47 100755
20--- a/Makefile
21+++ b/Makefile
22@@ -22,7 +22,7 @@ OUT_FILE = vsidaemon
23 DEC = nxp_enc_hw
24 ENC = nxp_dec_hw
25 LIBFILES =
26-LD_FLAGS = -lpthread -lm
27+LD_FLAGS = $(LDFLAGS) -lpthread -lm
28
29 PLATFORM ?= IMX8MP
30
31--
322.17.1
33
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
new file mode 100644
index 00000000..88b9ee0e
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
@@ -0,0 +1,32 @@
1# Copyright 2021 NXP
2DESCRIPTION = "i.MX Hantro V4L2 Daemon"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
5
6DEPENDS = "imx-vpu-hantro"
7DEPENDS_append_mx8mp = " imx-vpu-hantro-vc"
8
9SRC_URI = " \
10 ${FSL_MIRROR}/${BP}.tar.gz \
11 file://0001-Makefile-Honor-LDFLAGS-from-toolchain.patch \
12"
13SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2"
14SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8"
15
16PLATFORM_mx8mm = "IMX8MM"
17PLATFORM_mx8mq = "IMX8MQ"
18PLATFORM_mx8mp = "IMX8MP"
19
20EXTRA_OEMAKE = " \
21 CROSS_COMPILE="${HOST_PREFIX}" \
22 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
23 CTRLSW_HDRPATH="${STAGING_INCDIR}" \
24 PLATFORM="${PLATFORM}" \
25"
26
27do_install () {
28 oe_runmake install DEST_DIR="${D}"
29}
30
31PACKAGE_ARCH = "${MACHINE_SOCARCH}"
32COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
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 @@
1From 5bfb24738c47003fd04a86bfd5a49f8c6354ed23 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Fri, 28 Aug 2020 07:46:35 +0000
4Subject: [PATCH] decoder_sw: resolve compilation error with -fcommon
5
6-fcommon is enabled by default in gcc10 compiler, which results in
7following build errors:
8
9decoder_sw/software/source/inc/decapicommon.h:272: multiple definition
10of `DecPicCodingType'; decoder_sw/software/linux/dwl/dwl_linux.o:
11decoder_sw/software/source/inc/decapicommon.h:272: first defined here
12
13decoder_sw/software/source/inc/dwl.h:94: multiple definition of
14`DWLInitParam'; decoder_sw/software/linux/dwl/dwl_linux.o:
15decoder_sw/software/source/inc/dwl.h:94: first defined here
16
17Drop multiple enum name definitions, which solves above compilation
18issues.
19
20Signed-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
26diff --git a/decoder_sw/software/source/inc/decapicommon.h b/decoder_sw/software/source/inc/decapicommon.h
27index 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 {
39diff --git a/decoder_sw/software/source/inc/dwl.h b/decoder_sw/software/source/inc/dwl.h
40index 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--
532.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
3DESCRIPTION = "i.MX Hantro VPU library"
4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
6
7PROVIDES = "virtual/imxvpu"
8
9SRC_URI = " \
10 ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
11"
12SRC_URI[md5sum] = "682b3a73bf5aa22a37d56a433d11fc91"
13SRC_URI[sha256sum] = "e6cdd5b4c628604906466fc9620e2b048cf1b2c863f9ee49616dd5212b9261b0"
14
15inherit fsl-eula-unpack use-imx-headers
16
17PARALLEL_MAKE="-j 1"
18
19PLATFORM_mx8mm = "IMX8MM"
20PLATFORM_mx8mq = "IMX8MQ"
21PLATFORM_mx8mp = "IMX8MP"
22
23do_compile () {
24 oe_runmake CROSS_COMPILE="${HOST_PREFIX}" \
25 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
26 PLATFORM="${PLATFORM}" all
27}
28
29do_install () {
30 oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install
31}
32
33FILES_${PN} += "/unit_tests"
34
35COMPATIBLE_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..20ac87c7
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
@@ -0,0 +1,35 @@
1# Copyright (C) 2017-2020 NXP
2
3DESCRIPTION = "i.MX Hantro VPU library"
4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6
7PROVIDES = "virtual/imxvpu"
8
9SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
10SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1"
11SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00"
12
13inherit fsl-eula-unpack use-imx-headers
14
15PARALLEL_MAKE="-j 1"
16
17PLATFORM_mx8mm = "IMX8MM"
18PLATFORM_mx8mq = "IMX8MQ"
19PLATFORM_mx8mp = "IMX8MP"
20
21EXTRA_OEMAKE = " \
22 CROSS_COMPILE="${HOST_PREFIX}" \
23 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
24 PLATFORM="${PLATFORM}" \
25"
26
27do_install () {
28 oe_runmake install DEST_DIR="${D}"
29}
30
31FILES_${PN} += "/unit_tests"
32
33RDEPENDS_${PN} += "imx-vpu-hantro-daemon"
34
35COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-27 19:08:07 +0000