diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-06-02 17:07:31 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-02 17:07:31 -0300 |
commit | 3e876eb3a56e62e9c46d81d658d5ba799fcdde09 (patch) | |
tree | 2fc5311cf9da2d978ca93355a2c1e5acd0c55bc5 /recipes-bsp | |
parent | 23a13d7223555d5906d600a2a6d8dcf79865f3bb (diff) | |
parent | d674ba9a3c85adc58b06a559f13a3139b31320a9 (diff) | |
download | meta-freescale-3e876eb3a56e62e9c46d81d658d5ba799fcdde09.tar.gz |
Merge pull request #1560 from chrisdimich/master
Update various recipes as per NXP release 6.1.1-1.0.0
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb (renamed from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb) | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch | 49 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb (renamed from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb) | 11 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb) | 6 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb) | 21 |
5 files changed, 21 insertions, 70 deletions
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb index b5e1d0e1..f603190b 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb | |||
@@ -7,8 +7,8 @@ DEPENDS = "imx-vpu-hantro" | |||
7 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" | 7 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" |
10 | SRC_URI[md5sum] = "e4bdaa1e064e3959576f7dd5a2d89389" | 10 | SRC_URI[md5sum] = "23997361dab3054e5a3757a15d33db16" |
11 | SRC_URI[sha256sum] = "83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8" | 11 | SRC_URI[sha256sum] = "ac2b60fb754792eedcfdfc8cf59663cfeaedc402857eff13ac97a911d2c65801" |
12 | 12 | ||
13 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" | 13 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" |
14 | PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" | 14 | PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" |
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch deleted file mode 100644 index 861230bb..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From aba22ec2e285cf7557a5049fa6181e82e7f1a489 Mon Sep 17 00:00:00 2001 | ||
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | ||
3 | Date: Mon, 21 Nov 2022 12:04:09 +0000 | ||
4 | Subject: [PATCH] buildsystem: don't ignore externally set cflags | ||
5 | |||
6 | Upstream-Status: pending | ||
7 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
8 | --- | ||
9 | decoder_sw/software/linux/h264high/Makefile | 4 ++-- | ||
10 | decoder_sw/software/linux/vp6/Makefile | 4 ++-- | ||
11 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/decoder_sw/software/linux/h264high/Makefile b/decoder_sw/software/linux/h264high/Makefile | ||
14 | index 556ff71..7bdd99d 100755 | ||
15 | --- a/decoder_sw/software/linux/h264high/Makefile | ||
16 | +++ b/decoder_sw/software/linux/h264high/Makefile | ||
17 | @@ -50,10 +50,10 @@ CLEAR_HDRINFO_IN_SEEK = n | ||
18 | DEBUG = y | ||
19 | # Add your debugging flag (or not) to CFLAGS | ||
20 | ifeq ($(DEBUG),y) | ||
21 | - CFLAGS = $(M32) -g -O0 | ||
22 | + CFLAGS += $(M32) -g -O0 | ||
23 | DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_RANGE_CHECK -D_ERROR_PRINT | ||
24 | else | ||
25 | - CFLAGS = $(M32) -O3 | ||
26 | + CFLAGS += $(M32) -O3 | ||
27 | DEBFLAGS = -DNDEBUG | ||
28 | endif | ||
29 | |||
30 | diff --git a/decoder_sw/software/linux/vp6/Makefile b/decoder_sw/software/linux/vp6/Makefile | ||
31 | index b6e6914..b933d46 100755 | ||
32 | --- a/decoder_sw/software/linux/vp6/Makefile | ||
33 | +++ b/decoder_sw/software/linux/vp6/Makefile | ||
34 | @@ -50,10 +50,10 @@ DEBUG = y | ||
35 | |||
36 | # Add your debugging flag (or not) to CFLAGS | ||
37 | ifeq ($(DEBUG),y) | ||
38 | - CFLAGS = -g -O0 | ||
39 | + CFLAGS += -g -O0 | ||
40 | DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_ERROR_PRINT | ||
41 | else | ||
42 | - CFLAGS = -O3 | ||
43 | + CFLAGS += -O3 | ||
44 | DEBFLAGS = -DNDEBUG | ||
45 | endif | ||
46 | |||
47 | -- | ||
48 | 2.35.3 | ||
49 | |||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb index 35adecf8..0757a7fb 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb | |||
@@ -2,16 +2,13 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX Hantro VPU library" | 3 | DESCRIPTION = "i.MX Hantro VPU library" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
6 | 6 | ||
7 | PROVIDES = "virtual/imxvpu" | 7 | PROVIDES = "virtual/imxvpu" |
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
10 | ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ | 10 | SRC_URI[md5sum] = "81b4eb801349a0c198b7cc43eb8b6097" |
11 | file://0001-buildsystem-don-t-ignore-externally-set-cflags.patch \ | 11 | SRC_URI[sha256sum] = "e868e12945b4f217e2e0511fdc2587875d6c9124e8673b67f1e7de367ff5012f" |
12 | " | ||
13 | SRC_URI[md5sum] = "cfa0e92da0eca9cf622c4d7abc618cef" | ||
14 | SRC_URI[sha256sum] = "7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3" | ||
15 | 12 | ||
16 | inherit fsl-eula-unpack use-imx-headers | 13 | inherit fsl-eula-unpack use-imx-headers |
17 | 14 | ||
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb index e19ad6af..78a666c6 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb | |||
@@ -2,14 +2,14 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "Basler camera binary drivers" | 3 | DESCRIPTION = "Basler camera binary drivers" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
6 | 6 | ||
7 | inherit fsl-eula-unpack | 7 | inherit fsl-eula-unpack |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "99962b0cbba53ef773b7ac8cb50ce05a" | 11 | SRC_URI[md5sum] = "4e33adeb8a43f5bd06703368721085f5" |
12 | SRC_URI[sha256sum] = "fd2f71c854134683ac293393255d61b985e75d8dae2e090c99c21dff756017fb" | 12 | SRC_URI[sha256sum] = "c44fc890902d9d8ef22186d56af035c9cac182817525e64575e3b79015383790" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | dest_dir=${D}/opt/imx8-isp/bin | 15 | dest_dir=${D}/opt/imx8-isp/bin |
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb index 33dadad3..4591965f 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb | |||
@@ -2,12 +2,13 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX Verisilicon Software ISP" | 3 | DESCRIPTION = "i.MX Verisilicon Software ISP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" |
6 | DEPENDS = "libdrm virtual/libg2d libtinyxml2" | 6 | DEPENDS = "boost libdrm virtual/libg2d libtinyxml2" |
7 | 7 | ||
8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
9 | SRC_URI[md5sum] = "01f83394df91091f414f122c339c02bc" | 9 | |
10 | SRC_URI[sha256sum] = "ab65a413f397230010266579df570beac5fde4af430e31fc251d7cf7c8fa2232" | 10 | SRC_URI[md5sum] = "2f2fc2f6209a5efe7ef14cb6711b6292" |
11 | SRC_URI[sha256sum] = "66340acdda4318b2031791f488a95b59541c98cd1e255abdc070a2d1e6e9494d" | ||
11 | 12 | ||
12 | inherit fsl-eula-unpack cmake systemd use-imx-headers | 13 | inherit fsl-eula-unpack cmake systemd use-imx-headers |
13 | 14 | ||
@@ -51,12 +52,13 @@ do_install() { | |||
51 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin | 52 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin |
52 | cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin | 53 | cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin |
53 | cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin | 54 | cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin |
54 | cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin | ||
55 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin | 55 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin |
56 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin | 56 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin |
57 | |||
57 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} | 58 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} |
58 | cp -r ${B}/generated/release/include/* ${D}/${includedir} | 59 | cp -r ${B}/generated/release/include/* ${D}/${includedir} |
59 | 60 | ||
61 | cp -r ${S}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin | ||
60 | cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin | 62 | cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin |
61 | cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin | 63 | cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin |
62 | 64 | ||
@@ -74,14 +76,15 @@ do_install() { | |||
74 | # unversioned .so libraries go to the main package and versioned .so | 76 | # unversioned .so libraries go to the main package and versioned .so |
75 | # symlinks go to -dev. | 77 | # symlinks go to -dev. |
76 | FILES_SOLIBSDEV = "" | 78 | FILES_SOLIBSDEV = "" |
79 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" | ||
80 | FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" | ||
77 | FILES_SOLIBS_VERSIONED = " \ | 81 | FILES_SOLIBS_VERSIONED = " \ |
78 | ${libdir}/libar1335.so \ | 82 | ${libdir}/libcppnetlib-client-connections.so \ |
83 | ${libdir}/libcppnetlib-server-parsers.so \ | ||
84 | ${libdir}/libcppnetlib-uri.so \ | ||
79 | ${libdir}/libjsoncpp.so \ | 85 | ${libdir}/libjsoncpp.so \ |
80 | ${libdir}/libos08a20.so \ | 86 | ${libdir}/libos08a20.so \ |
81 | ${libdir}/libov2775.so \ | ||
82 | " | 87 | " |
83 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" | ||
84 | FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" | ||
85 | 88 | ||
86 | RDEPENDS:${PN} = "libdrm" | 89 | RDEPENDS:${PN} = "libdrm" |
87 | 90 | ||