diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-08-17 12:25:27 -0500 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-08-18 11:22:14 +0000 |
commit | 18b08de21316cdd9ecb2ebf9cd931e4bfc3b6071 (patch) | |
tree | f120443eb2e5a3d36e0cb20d25dab6d0335175d9 | |
parent | aa9633d7490f813c90bc4725d4e862de783df778 (diff) | |
download | meta-freescale-18b08de21316cdd9ecb2ebf9cd931e4bfc3b6071.tar.gz |
isp-imx: Upgrade 4.2.2.16.0 -> 4.2.2.18.0
- Drop the dependency on Python
- Incorporate the patch 0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch (ca1cc9966)
- Update to libtinyxml2 9
Fixes:
ca1cc9966 LF-6283: Fix isp startup is incorrect for third-party boards
f20917e56 LF-6262-2: Delete nodes in os08a20 4k xml files that lead android crash
44e4e5486 LF-6262-1: Fix the os08a20 4k work abnormally
dfa4b6671 LF-5970: Add the support for sensor os08a20 in the i.mx865
b92bd279e LF-6200: isp: remove isp-imx includes 4 GPL files
5501b5a2e remove the mode 4 for basler camera
b07f11f7c M865SW-978: media-server stop need sync
3fb6a58ff New partial build partial_release_20220408_4.2.2_p18
197077ee7 Update Release P18 from Verisilicon
e116968e3 update the build script to include OS08A20 things
ea5f3e9a3 update calibration XML file for OS08A20
0f8e04791 remove drm_test and isp_tpg_test from the isp build
a7740c028 update the xml file name as basler updates
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 76b1f6d21c4e7593ce848641a37d179d5f3d6979)
-rw-r--r-- | recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch | 28 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb) | 38 | ||||
-rw-r--r-- | recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb | 22 |
3 files changed, 16 insertions, 72 deletions
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch deleted file mode 100644 index bfea33a7..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From a48c605b9f3860ee7abaca1a37add444a1b4001a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chris Dimich <chris.dimich@boundarydevices.com> | ||
3 | Date: Tue, 8 Mar 2022 14:45:28 -0800 | ||
4 | Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable | ||
5 | |||
6 | The NR_DEVICE_TREE_BASLER variable has the wrong path. | ||
7 | |||
8 | Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com> | ||
9 | --- | ||
10 | imx/start_isp.sh | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/imx/start_isp.sh b/imx/start_isp.sh | ||
14 | index 6daabc59c..8a07acfed 100755 | ||
15 | --- a/imx/start_isp.sh | ||
16 | +++ b/imx/start_isp.sh | ||
17 | @@ -7,7 +7,7 @@ | ||
18 | # | ||
19 | |||
20 | RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" | ||
21 | -NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) | ||
22 | +NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam `find /sys/firmware/devicetree/base/soc@0/ -name compatible | grep i2c` -l | wc -l 2> /dev/null) | ||
23 | NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) | ||
24 | |||
25 | # check if the basler device has been enabled in the device tree | ||
26 | -- | ||
27 | 2.31.1 | ||
28 | |||
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb index 2d99496e..177caa14 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb | |||
@@ -1,17 +1,13 @@ | |||
1 | # Copyright 2020-2021 NXP | 1 | # Copyright 2020-2022 NXP |
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=03bcadc8dc0a788f66ca9e2b89f56c6f" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" |
6 | DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8" | 6 | DEPENDS = "libdrm virtual/libg2d libtinyxml2" |
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
9 | ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ | 9 | SRC_URI[md5sum] = "a20171db4bf2be423a587f3b610f0a69" |
10 | file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \ | 10 | SRC_URI[sha256sum] = "468ae51223d1873a1a756a1e64a53c0c61ebd640b3810f3a9e912b6a0de6c3c8" |
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2" | ||
14 | SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca" | ||
15 | 11 | ||
16 | inherit fsl-eula-unpack cmake systemd use-imx-headers | 12 | inherit fsl-eula-unpack cmake systemd use-imx-headers |
17 | 13 | ||
@@ -45,14 +41,6 @@ EXTRA_OECMAKE += " \ | |||
45 | -Wno-dev \ | 41 | -Wno-dev \ |
46 | " | 42 | " |
47 | 43 | ||
48 | do_configure:prepend() { | ||
49 | export SDKTARGETSYSROOT=${STAGING_DIR_HOST} | ||
50 | } | ||
51 | |||
52 | do_compile:prepend() { | ||
53 | ln -sf ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so.?.?.? ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so | ||
54 | } | ||
55 | |||
56 | do_install() { | 44 | do_install() { |
57 | install -d ${D}/${libdir} | 45 | install -d ${D}/${libdir} |
58 | install -d ${D}/${includedir} | 46 | install -d ${D}/${includedir} |
@@ -60,6 +48,8 @@ do_install() { | |||
60 | 48 | ||
61 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin | 49 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin |
62 | cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin | 50 | cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin |
51 | cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin | ||
52 | cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin | ||
63 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin | 53 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin |
64 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin | 54 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin |
65 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} | 55 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} |
@@ -78,17 +68,21 @@ do_install() { | |||
78 | } | 68 | } |
79 | 69 | ||
80 | # The build contains a mix of versioned and unversioned libraries, so | 70 | # The build contains a mix of versioned and unversioned libraries, so |
81 | # the default packaging configuration needs some modifications | 71 | # the default packaging configuration needs some modification so that |
72 | # unversioned .so libraries go to the main package and versioned .so | ||
73 | # symlinks go to -dev. | ||
82 | FILES_SOLIBSDEV = "" | 74 | FILES_SOLIBSDEV = "" |
83 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" | 75 | FILES_SOLIBS_VERSIONED = " \ |
84 | FILES:${PN}-dev += " \ | 76 | ${libdir}/libar1335.so \ |
85 | ${libdir}/libjsoncpp.so \ | 77 | ${libdir}/libjsoncpp.so \ |
86 | ${libdir}/libos08a20.so \ | 78 | ${libdir}/libos08a20.so \ |
87 | ${libdir}/libov2775.so \ | 79 | ${libdir}/libov2775.so \ |
88 | " | 80 | " |
81 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" | ||
82 | FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" | ||
89 | 83 | ||
90 | INSANE_SKIP:${PN} = "rpaths" | 84 | INSANE_SKIP:${PN} = "rpaths" |
91 | 85 | ||
92 | RDEPENDS:${PN} = "libdrm libpython3" | 86 | RDEPENDS:${PN} = "libdrm" |
93 | 87 | ||
94 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" | 88 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" |
diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb deleted file mode 100644 index 07d52355..00000000 --- a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" | ||
2 | HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "Zlib" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" | ||
6 | |||
7 | SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" | ||
8 | |||
9 | SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | inherit cmake | ||
14 | |||
15 | # make sure we don't provide files which are also present in the | ||
16 | # current libtinyxml2 version's -dev package. | ||
17 | do_install:append() { | ||
18 | rm -rf ${D}/${includedir} | ||
19 | rm -rf ${D}/${libdir}/cmake | ||
20 | rm -rf ${D}/${libdir}/libtinyxml2.so | ||
21 | rm -rf ${D}/${libdir}/pkgconfig | ||
22 | } | ||