From 961fac5f27cf93db67e14a1c93464bc3b6cefc33 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:39:24 -0700 Subject: imx-vpu-hantro: upgrade to 1.28.0 Remove patch that prevented warning from oe qa, but no longer needed as new version builds with no warning. As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- ...system-don-t-ignore-externally-set-cflags.patch | 49 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb | 39 ----------------- .../imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb | 36 ++++++++++++++++ 3 files changed, 36 insertions(+), 88 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb 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 861230bbd..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From aba22ec2e285cf7557a5049fa6181e82e7f1a489 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Mon, 21 Nov 2022 12:04:09 +0000 -Subject: [PATCH] buildsystem: don't ignore externally set cflags - -Upstream-Status: pending -Signed-off-by: Max Krummenacher ---- - decoder_sw/software/linux/h264high/Makefile | 4 ++-- - decoder_sw/software/linux/vp6/Makefile | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/decoder_sw/software/linux/h264high/Makefile b/decoder_sw/software/linux/h264high/Makefile -index 556ff71..7bdd99d 100755 ---- a/decoder_sw/software/linux/h264high/Makefile -+++ b/decoder_sw/software/linux/h264high/Makefile -@@ -50,10 +50,10 @@ CLEAR_HDRINFO_IN_SEEK = n - DEBUG = y - # Add your debugging flag (or not) to CFLAGS - ifeq ($(DEBUG),y) -- CFLAGS = $(M32) -g -O0 -+ CFLAGS += $(M32) -g -O0 - DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_RANGE_CHECK -D_ERROR_PRINT - else -- CFLAGS = $(M32) -O3 -+ CFLAGS += $(M32) -O3 - DEBFLAGS = -DNDEBUG - endif - -diff --git a/decoder_sw/software/linux/vp6/Makefile b/decoder_sw/software/linux/vp6/Makefile -index b6e6914..b933d46 100755 ---- a/decoder_sw/software/linux/vp6/Makefile -+++ b/decoder_sw/software/linux/vp6/Makefile -@@ -50,10 +50,10 @@ DEBUG = y - - # Add your debugging flag (or not) to CFLAGS - ifeq ($(DEBUG),y) -- CFLAGS = -g -O0 -+ CFLAGS += -g -O0 - DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_ERROR_PRINT - else -- CFLAGS = -O3 -+ CFLAGS += -O3 - DEBFLAGS = -DNDEBUG - endif - --- -2.35.3 - 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.27.0.bb deleted file mode 100644 index 35adecf88..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://0001-buildsystem-don-t-ignore-externally-set-cflags.patch \ -" -SRC_URI[md5sum] = "cfa0e92da0eca9cf622c4d7abc618cef" -SRC_URI[sha256sum] = "7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm-nxp-bsp = "IMX8MM" -PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" -PLATFORM:mx8mp-nxp-bsp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -FILES:${PN} += "/unit_tests" - -RDEPENDS:${PN} += "imx-vpu-hantro-daemon" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb new file mode 100644 index 000000000..0757a7fb5 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.28.0.bb @@ -0,0 +1,36 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "81b4eb801349a0c198b7cc43eb8b6097" +SRC_URI[sha256sum] = "e868e12945b4f217e2e0511fdc2587875d6c9124e8673b67f1e7de367ff5012f" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +FILES:${PN} += "/unit_tests" + +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 5f6a93cee61f864b5a47511fea7d0a9d5e45ac30 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:40:15 -0700 Subject: imx-vpu-hantro-daemon: upgrade to 1.1.6 As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb | 29 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb 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.4.bb deleted file mode 100644 index b5e1d0e1f..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2021 NXP -DESCRIPTION = "i.MX Hantro V4L2 Daemon" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" - -DEPENDS = "imx-vpu-hantro" -DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" - -SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" -SRC_URI[md5sum] = "e4bdaa1e064e3959576f7dd5a2d89389" -SRC_URI[sha256sum] = "83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8" - -PLATFORM:mx8mm-nxp-bsp = "IMX8MM" -PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" -PLATFORM:mx8mp-nxp-bsp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - CTRLSW_HDRPATH="${STAGING_INCDIR}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb new file mode 100644 index 000000000..f603190be --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.6.bb @@ -0,0 +1,29 @@ +# Copyright 2021 NXP +DESCRIPTION = "i.MX Hantro V4L2 Daemon" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" + +DEPENDS = "imx-vpu-hantro" +DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" + +SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" +SRC_URI[md5sum] = "23997361dab3054e5a3757a15d33db16" +SRC_URI[sha256sum] = "ac2b60fb754792eedcfdfc8cf59663cfeaedc402857eff13ac97a911d2c65801" + +PLATFORM:mx8mm-nxp-bsp = "IMX8MM" +PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" +PLATFORM:mx8mp-nxp-bsp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + CTRLSW_HDRPATH="${STAGING_INCDIR}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 902cd37f11a7659d0fb269eda5f2158969ee0164 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:42:59 -0700 Subject: imx-vpuwrap: Upgrade to 6.1.1-1.0.0 As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb index ad00e3a19..1646762d4 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb @@ -5,14 +5,14 @@ DESCRIPTION = "Freescale Multimedia VPU wrapper" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479" DEPENDS = "virtual/imxvpu" DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "c9fc1fd57094accdb6e0e72e635716718482efe7" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "12a78274b3bc4f3105aabe16df03edd5e0c3b84a" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From a9cdd056f8af070c4269afc9af8bf21e4fbfa16f Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:43:59 -0700 Subject: kernel-module-isp-vvcam: upgrade to 4.2.2.21.0 As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- .../kernel-module-isp-vvcam_4.2.2.19.0.bb | 24 ---------------------- .../kernel-module-isp-vvcam_4.2.2.21.0.bb | 20 ++++++++++++++++++ 2 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb deleted file mode 100644 index 05431165a..000000000 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020-2021 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-5.15.y_2.1.0" -SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a" - -S = "${WORKDIR}/git/vvcam/v4l2" -DEBUG_PREFIX_MAP = "-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} \ - -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${STAGING_DIR_HOST}= \ - -fmacro-prefix-map=${STAGING_DIR_HOST}= \ - -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ -" - -inherit module - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" 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 new file mode 100644 index 000000000..206018ebe --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.21.0.bb @@ -0,0 +1,20 @@ +# 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)" -- cgit v1.2.3-54-g00ecf From 81534b4869b0beecc56e41063231cc22c1308798 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:44:46 -0700 Subject: isp-imx: upgrade to 4.2.2.21.0 As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb | 88 ------------------------------ recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb | 91 +++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 88 deletions(-) delete mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb create mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb 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.19.0.bb deleted file mode 100644 index 33dadad3d..000000000 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2020-2023 NXP - -DESCRIPTION = "i.MX Verisilicon Software ISP" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" -DEPENDS = "libdrm virtual/libg2d libtinyxml2" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "01f83394df91091f414f122c339c02bc" -SRC_URI[sha256sum] = "ab65a413f397230010266579df570beac5fde4af430e31fc251d7cf7c8fa2232" - -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 ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${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 ${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_SOLIBS_VERSIONED = " \ - ${libdir}/libar1335.so \ - ${libdir}/libjsoncpp.so \ - ${libdir}/libos08a20.so \ - ${libdir}/libov2775.so \ -" -FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" - -RDEPENDS:${PN} = "libdrm" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" 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 new file mode 100644 index 000000000..4591965f6 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.21.0.bb @@ -0,0 +1,91 @@ +# 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)" -- cgit v1.2.3-54-g00ecf From d674ba9a3c85adc58b06a559f13a3139b31320a9 Mon Sep 17 00:00:00 2001 From: Chris Dimich Date: Thu, 25 May 2023 09:45:34 -0700 Subject: basler-camera: upgrade to 4.2.2.21.0 As per NXP langdale-6.1.1-1.0.0 release. Signed-off-by: Chris Dimich --- recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb | 28 ------------------------- recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb | 28 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb 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.19.0.bb deleted file mode 100644 index e19ad6aff..000000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2020-2022 NXP - -DESCRIPTION = "Basler camera binary drivers" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "99962b0cbba53ef773b7ac8cb50ce05a" -SRC_URI[sha256sum] = "fd2f71c854134683ac293393255d61b985e75d8dae2e090c99c21dff756017fb" - -do_install() { - 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.21.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb new file mode 100644 index 000000000..78a666c66 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.21.0.bb @@ -0,0 +1,28 @@ +# 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() { + 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