aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-bsp/isp-imx
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-bsp/isp-imx')
-rw-r--r--recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb)13
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch44
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch72
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch53
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb92
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb105
-rw-r--r--recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb22
7 files changed, 156 insertions, 245 deletions
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
index 0122d273..0ab44074 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb
@@ -1,15 +1,15 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2023 NXP
DESCRIPTION = "Basler camera binary drivers"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
inherit fsl-eula-unpack
SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47"
-SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6"
+SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71"
+SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf"
do_install() {
dest_dir=${D}/opt/imx8-isp/bin
@@ -22,6 +22,7 @@ do_install() {
SYSTEMD_AUTO_ENABLE = "enable"
FILES:${PN} = "${libdir} /opt"
-INSANE_SKIP:${PN} = "file-rdeps already-stripped"
+INSANE_SKIP:${PN} = "already-stripped"
+RDEPENDS:${PN} += "isp-imx"
-COMPATIBLE_MACHINE = "(mx8mp)"
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
new file mode 100644
index 00000000..3f04000c
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0001-cpp-netlib-parsers.ipp-add-missing-include.patch
@@ -0,0 +1,44 @@
+From 15aae364fb52df30e4a49e73e2048fdc633e6868 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sun, 8 Oct 2023 09:15:54 -0300
+Subject: [PATCH] cpp-netlib: parsers.ipp: add missing include
+
+With the update to boost from 1.82.0 -> 1.83.0 we now get compiler errors:
+
+| .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:58:3: error: 'u8_to_u32_iterator' was not declared in this scope
+
+Add the missing explicit include. Before the file was indirectly included from qi.hpp:
+
+| In file included from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/regex/pending/unicode_iterator.hpp:27,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/utf8.hpp:15,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/info.hpp:17,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/domain.hpp:16,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/meta_compiler.hpp:15,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action/action.hpp:14,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action.hpp:14,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi.hpp:14,
+| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/include/qi.hpp:16,
+| from .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:5,
+
+Upstream-Status: Pending
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ .../boost/network/protocol/http/server/impl/parsers.ipp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
+index c31e60e..2b83fbe 100755
+--- a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
++++ b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
+@@ -13,6 +13,7 @@
+ #include <tuple>
+ #include <boost/fusion/include/std_tuple.hpp>
+ #include <boost/network/protocol/http/message/header.hpp>
++#include <boost/regex/pending/unicode_iterator.hpp>
+
+ #ifdef BOOST_NETWORK_NO_LIB
+ #ifndef BOOST_NETWORK_INLINE
+--
+2.35.3
+
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
deleted file mode 100644
index c3ee088f..00000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sat, 30 Oct 2021 17:26:42 +0200
-Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__
-
-With reproducible build enabled the compiler is configured to throw
-an error if __TIME__, __DATE__ preprocessor macros are used.
-
-| isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time]
-| 99 | std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-| | ^~~~~~~~
-
-Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting
-BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present
-or the local time otherwise.
-
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- mediacontrol/CMakeLists.txt | 3 +++
- mediacontrol/daemon/main_v4l2.cpp | 8 ++++----
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt
-index 5849c163e..8a8e1a4a0 100755
---- a/mediacontrol/CMakeLists.txt
-+++ b/mediacontrol/CMakeLists.txt
-@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0)
-
- project(ISP_MEDIA_CONTROL)
-
-+string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC)
-+add_compile_definitions(BUILD_DATE="${BUILD_DATE}")
-+
- if( NOT DEFINED APPSHELL_TOP_COMPILE)
- if(DEFINED PLATFORM)
- if(${PLATFORM} STREQUAL ARM64)
-diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp
-index d3d1c2423..dd0514358 100644
---- a/mediacontrol/daemon/main_v4l2.cpp
-+++ b/mediacontrol/daemon/main_v4l2.cpp
-@@ -105,7 +105,7 @@ int main(int argc, char* argv[]) {
- if(!(string2Version.find(argv[1])==string2Version.end())){
- std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
-- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
- return 0;
- }
-@@ -116,8 +116,8 @@ int main(int argc, char* argv[]) {
- {
- ALOGI("******************************************************************");
- #ifndef ANDROID
-- ALOGI("VIV ISP Media Control Framework V%s (%s, %s)",
-- MEDIA_SERVER_VERSION, __DATE__, __TIME__);
-+ ALOGI("VIV ISP Media Control Framework V%s (%s)",
-+ MEDIA_SERVER_VERSION, BUILD_DATE);
- #else
- ALOGI("VIV ISP Media Control Framework V%s", MEDIA_SERVER_VERSION);
- #endif
-@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) {
- if(!(string2Version.find(argv[i])==string2Version.end())){
- std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
-- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
- i++;
- continue;
---
-2.20.1
-
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 950098cd..00000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9c65e20b82cfd9e82b849b3140eec7b8c18922dc Mon Sep 17 00:00:00 2001
-From: Chris Dimich <Chris.Dimich@boundarydevices.com>
-Date: Mon, 13 Sep 2021 17:56:02 -0700
-Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable
-
-Also remove uneeded -lm option from run.sh script.
-
-Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
----
- imx/start_isp.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/imx/start_isp.sh b/imx/start_isp.sh
-index 6daabc59c..250226935 100755
---- a/imx/start_isp.sh
-+++ b/imx/start_isp.sh
-@@ -7,7 +7,7 @@
- #
-
- RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
--NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
-+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)
- NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
-
- # check if the basler device has been enabled in the device tree
-@@ -21,13 +21,13 @@ if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then
-
- # Default configuration for Basler daA3840-30mc: basler_4k
- # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr
-- exec ./run.sh -c basler_4k -lm
-+ exec ./run.sh -c basler_4k
-
- elif [ $NR_DEVICE_TREE_OV5640 -eq 1 ]; then
-
- # Default configuration for Basler daA3840-30mc: basler_1080p60
- # Available configurations: basler_1080p60, basler_1080p60hdr
-- exec ./run.sh -c basler_1080p60 -lm
-+ exec ./run.sh -c basler_1080p60
-
- fi
-
-@@ -38,7 +38,7 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; then
- cd $RUNTIME_DIR
- # Default configuration for Basler daA3840-30mc: dual_basler_1080p60
- # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr, dual_basler_1080p25hdr
-- exec ./run.sh -c dual_basler_1080p60 -lm
-+ exec ./run.sh -c dual_basler_1080p60
-
- else
- # no device tree found exit with code no device or address
---
-2.31.1
-
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
deleted file mode 100644
index 9ede07bd..00000000
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2020-2021 NXP
-
-DESCRIPTION = "i.MX Verisilicon Software ISP"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
-DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8"
-
-SRC_URI = " \
- ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
- file://0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch \
- file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \
-"
-
-SRC_URI[md5sum] = "e9e0943b9f4923c767d07901e550c41c"
-SRC_URI[sha256sum] = "13274c0fd442da4b3b9900a7568c59872ffa6408f5699d35eebc6760a8e51297"
-
-inherit fsl-eula-unpack cmake systemd use-imx-headers
-
-# Build the sub-folder appshell
-OECMAKE_SOURCEPATH = "${S}/appshell"
-
-# Use make instead of ninja
-OECMAKE_GENERATOR = "Unix Makefiles"
-
-SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
-
-EXTRA_OECMAKE += " \
- -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
- -DCMAKE_BUILD_TYPE=release \
- -DISP_VERSION=ISP8000NANO_V1802 \
- -DPLATFORM=ARM64 \
- -DAPPMODE=V4L2 \
- -DQTLESS=1 \
- -DFULL_SRC_COMPILE=1 \
- -DWITH_DRM=1 \
- -DWITH_DWE=1 \
- -DSERVER_LESS=1 \
- -DSUBDEV_V4L2=1 \
- -DENABLE_IRQ=1 \
- -DPARTITION_BUILD=0 \
- -D3A_SRC_BUILD=0 \
- -DIMX_G2D=ON \
- -Wno-dev \
-"
-
-do_configure:prepend() {
- export SDKTARGETSYSROOT=${STAGING_DIR_HOST}
-}
-
-do_compile:prepend() {
- ln -sf ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so.?.?.? ${RECIPE_SYSROOT}/${libdir}/libtinyxml2.so
-}
-
-do_install() {
- install -d ${D}/${libdir}
- install -d ${D}/${includedir}
- install -d ${D}/opt/imx8-isp/bin
-
- cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
- cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin
- cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
- cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
- cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir}
- cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir}
-
- cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin
- cp ${WORKDIR}/${BP}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
-
- chmod +x ${D}/opt/imx8-isp/bin/run.sh
- chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/${BP}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
- fi
-}
-
-# The build contains a mix of versioned and unversioned libraries, so
-# the default packaging configuration needs some modifications
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
-FILES:${PN}-dev += " \
- ${libdir}/libjsoncpp.so \
- ${libdir}/libos08a20.so \
- ${libdir}/libov2775.so \
-"
-
-INSANE_SKIP:${PN} = "rpaths"
-
-RDEPENDS:${PN} = "libdrm libpython3"
-
-COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
new file mode 100644
index 00000000..9e0f0265
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb
@@ -0,0 +1,105 @@
+# Copyright 2020-2023 NXP
+
+DESCRIPTION = "i.MX Verisilicon Software ISP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 patchelf-native"
+
+SRC_URI = " \
+ ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
+ file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \
+"
+
+SRC_URI[sha256sum] = "34b23f5b9f0856a8f5722e339a7ad4ccf4d99614788598306ff8b20093c1e846"
+
+inherit fsl-eula-unpack cmake systemd use-imx-headers
+
+# Build the sub-folder appshell
+OECMAKE_SOURCEPATH = "${S}/appshell"
+
+# Use make instead of ninja
+OECMAKE_GENERATOR = "Unix Makefiles"
+
+# Workaround for linking issues seen with gold linker
+LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
+
+EXTRA_OECMAKE += " \
+ -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
+ -DCMAKE_BUILD_TYPE=release \
+ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+ -DCMAKE_INSTALL_LIBDIR=${libdir} \
+ -DISP_VERSION=ISP8000NANO_V1802 \
+ -DPLATFORM=ARM64 \
+ -DAPPMODE=V4L2 \
+ -DTUNINGEXT=1 \
+ -DQTLESS=1 \
+ -DFULL_SRC_COMPILE=1 \
+ -DWITH_DRM=1 \
+ -DWITH_DWE=1 \
+ -DSERVER_LESS=1 \
+ -DSUBDEV_V4L2=1 \
+ -DENABLE_IRQ=1 \
+ -DPARTITION_BUILD=0 \
+ -D3A_SRC_BUILD=0 \
+ -DIMX_G2D=ON \
+ -Wno-dev \
+"
+
+do_configure:prepend () {
+ # FIXME: Should be rebuild.
+ patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/units/cam_device/proprietories/lib/libcam_device.so
+ patchelf --replace-needed libtinyxml2.so.9 libtinyxml2.so.10 ${S}/mediacontrol/lib/arm-64/fpga/libcam_device.so
+}
+
+do_install() {
+ # FIXME: provided by the basler-camera package, do not install them here additionally
+ rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json
+
+ install -d ${D}/${libdir}
+ install -d ${D}/${includedir}
+ install -d ${D}/opt/imx8-isp/bin
+ install -d ${D}/opt/imx8-isp/bin/dewarp_config
+
+ cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
+ cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin
+ cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin
+ cp -r ${B}/generated/release/bin/tuningext ${D}/opt/imx8-isp/bin
+ cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
+ cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
+
+ cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir}
+ cp -r ${B}/generated/release/include/* ${D}/${includedir}
+
+ cp -r ${S}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
+ cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin
+ cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
+
+ chmod +x ${D}/opt/imx8-isp/bin/run.sh
+ chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
+ fi
+}
+
+# The build contains a mix of versioned and unversioned libraries, so
+# the default packaging configuration needs some modification so that
+# unversioned .so libraries go to the main package and versioned .so
+# symlinks go to -dev.
+FILES_SOLIBSDEV = ""
+FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
+FILES_SOLIBS_VERSIONED = " \
+ ${libdir}/libcppnetlib-client-connections.so \
+ ${libdir}/libcppnetlib-server-parsers.so \
+ ${libdir}/libcppnetlib-uri.so \
+ ${libdir}/libjsoncpp.so \
+ ${libdir}/libos08a20.so \
+"
+
+RDEPENDS:${PN} = "libdrm"
+
+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 @@
-SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs"
-HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/"
-SECTION = "libs"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd"
-
-SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https"
-
-SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-# make sure we don't provide files which are also present in the
-# current libtinyxml2 version's -dev package.
-do_install:append() {
- rm -rf ${D}/${includedir}
- rm -rf ${D}/${libdir}/cmake
- rm -rf ${D}/${libdir}/libtinyxml2.so
- rm -rf ${D}/${libdir}/pkgconfig
-}