From e527794ba59e700954c5ef34d7e846a7c37b43ab Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Mon, 24 Jul 2023 22:18:19 +0800 Subject: kernel-module-isp-vvcam: Upgrade to 4.2.2.22.0 As per NXP mickledore-6.1.22-2.0.0 release. Signed-off-by: Jun Zhu --- .../kernel-module-isp-vvcam_4.2.2.21.0.bb | 20 -------------------- .../kernel-module-isp-vvcam_4.2.2.22.0.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb deleted file mode 100644 index 206018eb..00000000 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2020-2022 NXP - -DESCRIPTION = "Kernel loadable module for ISP" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" - -SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" -ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" -SRCBRANCH = "lf-6.1.y_1.0.0" -SRCREV = "774808215a15e2acdc02967907c47515e3512f2d" - -S = "${WORKDIR}/git/vvcam/v4l2" - -inherit module - -DEBUG_PREFIX_MAP:prepend = " \ - -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb new file mode 100644 index 00000000..34625658 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.22.0.bb @@ -0,0 +1,20 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" +ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" +SRCBRANCH = "lf-6.1.22_2.0.0" +SRCREV = "dad0b927a26100ebcfbcb6ad09d64ecde767af7f" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +DEBUG_PREFIX_MAP:prepend = " \ + -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 4a5c3d95617bd6505da079ad9854c7ecd9de1d84 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Mon, 24 Jul 2023 22:23:38 +0800 Subject: isp-imx: Upgrade to 4.2.2.22.0 As per NXP mickledore-6.1.22-2.0.0 release. - Add new app "tuningext" Signed-off-by: Jun Zhu --- recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb | 91 ------------------------------ recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb | 93 +++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 91 deletions(-) delete mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb create mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb deleted file mode 100644 index 4591965f..00000000 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2020-2023 NXP - -DESCRIPTION = "i.MX Verisilicon Software ISP" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" -DEPENDS = "boost libdrm virtual/libg2d libtinyxml2" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "2f2fc2f6209a5efe7ef14cb6711b6292" -SRC_URI[sha256sum] = "66340acdda4318b2031791f488a95b59541c98cd1e255abdc070a2d1e6e9494d" - -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 \ - -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_install() { - 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/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/isp-imx_4.2.2.22.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb new file mode 100644 index 00000000..59a4c14d --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb @@ -0,0 +1,93 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" +DEPENDS = "boost libdrm virtual/libg2d libtinyxml2" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "693e76b20985de607208c21d996019f8" +SRC_URI[sha256sum] = "c2f450502390442926920d6457bbf24378c0338a445be180130ec6b1b12d1056" + +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 \ + -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_install() { + 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)" -- cgit v1.2.3-54-g00ecf From 5e2d41a676e9854e0065d71da5df51cf163aa333 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Mon, 24 Jul 2023 23:23:21 +0800 Subject: basler-camer: Upgrade to 4.2.2.22.0 As per NXP mickledore-6.1.22-2.0.0 release. Signed-off-by: Jun Zhu --- recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb | 32 ------------------------- recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb | 32 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb deleted file mode 100644 index 9eaa11b8..00000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2020-2022 NXP - -DESCRIPTION = "Basler camera binary drivers" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "4e33adeb8a43f5bd06703368721085f5" -SRC_URI[sha256sum] = "c44fc890902d9d8ef22186d56af035c9cac182817525e64575e3b79015383790" - -do_install() { - # provided by the isp-imx package, do not install them here additionally - rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_1080P_config.json - rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_4K_config.json - - dest_dir=${D}/opt/imx8-isp/bin - install -d ${D}/${libdir} - install -d $dest_dir - cp -r ${S}/opt/imx8-isp/bin/* $dest_dir - cp -r ${S}/usr/lib/* ${D}/${libdir} -} - -SYSTEMD_AUTO_ENABLE = "enable" - -FILES:${PN} = "${libdir} /opt" -INSANE_SKIP:${PN} = "already-stripped" -RDEPENDS:${PN} += "isp-imx" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb new file mode 100644 index 00000000..ee839cd9 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb @@ -0,0 +1,32 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "cb5e5a4d1efd1d845464ac9a8c6383b8" +SRC_URI[sha256sum] = "6fe10f5118d18a7cb1dd40e713343ce788ad3766104ad2471ee49aed7b55833a" + +do_install() { + # provided by the isp-imx package, do not install them here additionally + rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_1080P_config.json + rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_4K_config.json + + dest_dir=${D}/opt/imx8-isp/bin + install -d ${D}/${libdir} + install -d $dest_dir + cp -r ${S}/opt/imx8-isp/bin/* $dest_dir + cp -r ${S}/usr/lib/* ${D}/${libdir} +} + +SYSTEMD_AUTO_ENABLE = "enable" + +FILES:${PN} = "${libdir} /opt" +INSANE_SKIP:${PN} = "already-stripped" +RDEPENDS:${PN} += "isp-imx" + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf