From 3c8d3fb2880d6a8fadd13f07ae2ec7d819c7fa5f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 30 Oct 2021 17:41:14 +0200 Subject: isp-imx: refresh patch Refresh patch after version bump. Fixes commit ec31e767 ("isp-imx: upgrade to 4.2.2.15.0") | ERROR: isp-imx-4.2.2.15.0-r0 do_patch: Applying patch '0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch' on target directory '.../isp-imx/4.2.2.15.0-r0/isp-imx-4.2.2.15.0' | CmdError('quilt --quiltrc .../isp-imx/4.2.2.15.0-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch | patching file mediacontrol/CMakeLists.txt | patching file mediacontrol/daemon/main_v4l2.cpp | Hunk #1 FAILED at 96. | Hunk #2 FAILED at 105. | Hunk #3 FAILED at 123. | 3 out of 3 hunks FAILED -- rejects in file mediacontrol/daemon/main_v4l2.cpp | Patch 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch does not apply (enforce with -f) Signed-off-by: Max Krummenacher (cherry picked from commit b030a791d31b209ac002a8afb50851f98b9b20d3) --- ...001-isp-imx-drop-use-of-__TIME__-__DATE__.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 index d8d12267..c3ee088f 100644 --- 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 @@ -1,6 +1,6 @@ -From accaeb1ae77eb40b89e70df3efcb00d0dc2af758 Mon Sep 17 00:00:00 2001 +From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001 From: Max Krummenacher -Date: Mon, 14 Jun 2021 08:20:48 +0000 +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 @@ -21,7 +21,7 @@ Signed-off-by: Max Krummenacher 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt -index 48cd7633e..f587758e0 100755 +index 5849c163e..8a8e1a4a0 100755 --- a/mediacontrol/CMakeLists.txt +++ b/mediacontrol/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0) @@ -35,38 +35,38 @@ index 48cd7633e..f587758e0 100755 if(DEFINED PLATFORM) if(${PLATFORM} STREQUAL ARM64) diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp -index a3033cf83..d08dee127 100644 +index d3d1c2423..dd0514358 100644 --- a/mediacontrol/daemon/main_v4l2.cpp +++ b/mediacontrol/daemon/main_v4l2.cpp -@@ -96,7 +96,7 @@ int main(int argc, char* argv[]) { - if (argc == 2){ +@@ -105,7 +105,7 @@ int main(int argc, char* argv[]) { if(!(string2Version.find(argv[1])==string2Version.end())){ std::cout << "Version : "<= 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); - ALOGI("******************************************************************\n"); - - if (argc < 2) { -@@ -123,7 +123,7 @@ int main(int argc, char* argv[]) { - while( i < argc ){ + #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 : "< Date: Sat, 30 Oct 2021 18:19:49 +0200 Subject: isp-imx: fix configure error Fixes commit ec31e767 ("isp-imx: upgrade to 4.2.2.15.0") | CMake Error at CMakeLists.txt:86 (message): | -DSDKTARGETSYSROOT=... missing from cmake call Signed-off-by: Max Krummenacher (cherry picked from commit 88511f48fc14f90cc70e504e3a09e32722c62c11) --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 9f975511..89b0abd2 100644 --- 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 @@ -2,7 +2,7 @@ DESCRIPTION = "i.MX Verisilicon Software ISP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2" SRC_URI = " \ @@ -25,6 +25,7 @@ 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 \ -- cgit v1.2.3-54-g00ecf From 4cf4294ae9878af5afef7cfab7033401cc297cdc Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 1 Nov 2021 14:20:02 +0100 Subject: isp-imx: provide an libtinyxml2 8.0.0 recipe isp-imx has precompiled binaries linked against that libtinyxml2 version. Remove files which are also provided by the 'current' recipe version of libtinyxml so that they don't clash during image/SDK creation. Since the isp-imx does do a link step against libtinyxml2 create the the unversioned symlink libtinyxml2.so in do_compile. Signed-off-by: Max Krummenacher (cherry picked from commit 454602452d7a3fe8b25bfccc038c32dd22380406) --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 6 +++++- recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb 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 index 89b0abd2..379536fd 100644 --- 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 @@ -3,7 +3,7 @@ DESCRIPTION = "i.MX Verisilicon Software ISP" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2" +DEPENDS = "python3 libdrm virtual/libg2d libtinyxml2-8" SRC_URI = " \ ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ @@ -47,6 +47,10 @@ 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} diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb new file mode 100644 index 00000000..363f7305 --- /dev/null +++ b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb @@ -0,0 +1,22 @@ +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" + +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 +} -- cgit v1.2.3-54-g00ecf From edbaaa0c3c014124138ddf4044d22ee45fe2b853 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 1 Nov 2021 12:04:33 +0100 Subject: isp-imx: don't deploy files also deployed by basler-camera The files from dewarp/ are now provided from recipe basler-camera_4.2.2.15.0. Fixes the following doing do_rootfs: | * check_data_file_clashes: Package isp-imx wants to install file ...rootfs/opt/imx8-isp/bin/dewarp_config/sensor_dwe_1080P_config.json | But that file is already provided by package * libdaa3840-30mc1 Signed-off-by: Max Krummenacher (cherry picked from commit 3d5338c8859e80fcf626ddc7ab039ad1e357783e) --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 1 - 1 file changed, 1 deletion(-) 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 index 379536fd..9ede07bd 100644 --- 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 @@ -60,7 +60,6 @@ do_install() { 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}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} -- cgit v1.2.3-54-g00ecf From c7de502da0e228641f4d2cc5152d7060be176d1c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 13 Jan 2022 12:33:35 -0600 Subject: imx-mkimage: Update to 5.10.72-2.2.0 Includes update to patch 0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch which is partially applied by 1527fb9. Fixes in update: --- 7a277c8 LF-4794 iMX8ULP: move OPTEE OS base address to 0xa6000000 9a04474 Update iMX8DXL clean target to remove intermediate files dfe6265 Fix build warning c78d727 Fix iMX8DXL ahab container image extraction 9bd94cc LF-4522 Parse and extract the u-boot-atf container 6cf67ed iMX8QM/QX/DXL/ULP: Add core id to -data option 1527fb9 iMX8M: fix FIT DT node unit address cbf03b6 Fix issue with C0 versus B0 nightly pull for VAL. 7f98709 iMX8M: soc: fix support to override u-boot DTB file name c9cce4f iMX8ULP: support xip for m33 and add README ---- Signed-off-by: Tom Hochstein (cherry picked from commit 16f2894dc267ab515a0b441f2d5ad0695a2c9f07) --- ...age_fit_atf-fix-fit-generator-node-naming.patch | 135 ++------------------- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 +- 2 files changed, 14 insertions(+), 125 deletions(-) diff --git a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch b/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch index 3c2842af..5a4a895b 100644 --- a/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch +++ b/recipes-bsp/imx-mkimage/files/0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch @@ -1,19 +1,10 @@ -From 9cf936493388897379f33b511ec869c6fa5409ce Mon Sep 17 00:00:00 2001 +From f281b935985f1b592534ee2837ce0d0b28c7dc43 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin -Date: Thu, 22 Apr 2021 12:20:28 +0000 +Date: Tue, 11 Jan 2022 15:32:05 -0600 Subject: [PATCH] mkimage_fit_atf: fix fit generator node naming -Since upstream commit 79af75f777 ("fit: Don't allow verification of images -with @ nodes") [1], unit addresses on the nodes are prohibited and nodes -that do contain those addresses are ignored during the ITS parsing. This -is done in an effort to cover the CVE-2021-27138, where nodes with unit -addresses can be mis-interpreted by libfdt. - -Correct FIT generator script and replace nodes with unit addresses to -plain node names with "-" instead of "@" to create a unique naming. - -In addition, extend sections which contains "firmware" in their types -with "os" parameter to conform to the latest FIT specification. +Extend sections which contains "firmware" in their types with "os" +parameter to conform to the latest FIT specification. Indicate that load and entry addresses are covered by one 32-bit value by adding "address-cells" in the root node of the generated ITS. @@ -23,40 +14,13 @@ Link: [1] https://github.com/u-boot/u-boot/commit/79af75f7776fc20b0d7eb6afe1e27c Signed-off-by: Andrey Zhizhikin Cc: Tom Hochstein --- - iMX8M/mkimage_fit_atf.sh | 40 ++++++++++++++++++++++------------------ - 1 file changed, 22 insertions(+), 18 deletions(-) + iMX8M/mkimage_fit_atf.sh | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 95749b1..10903ea 100755 +index 4f2b3f3..10903ea 100755 --- a/iMX8M/mkimage_fit_atf.sh +++ b/iMX8M/mkimage_fit_atf.sh -@@ -23,7 +23,7 @@ else - fi - - BL32="tee.bin" --LOADABLES="\"atf@1\"" -+LOADABLES="\"atf-1\"" - - if [ ! -f $BL32 ]; then - BL32=/dev/null -@@ -31,7 +31,7 @@ else - echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2 - echo "tee.bin size: " >&2 - ls -lct tee.bin | awk '{print $5}' >&2 -- LOADABLES="$LOADABLES, \"tee@1\"" -+ LOADABLES="$LOADABLES, \"tee-1\"" - fi - - BL33="u-boot-nodtb.bin" -@@ -41,7 +41,7 @@ if [ ! -f $DEK_BLOB ]; then - DEK_BLOB=/dev/null - else - echo "Building with encrypted boot support, make sure to replace DEK Blob in final image." >&2 -- LOADABLES="\"dek_blob@1\", $LOADABLES" -+ LOADABLES="\"dek_blob-1\", $LOADABLES" - fi - - if [ ! -f $BL33 ]; then @@ -64,10 +64,12 @@ cat << __HEADER_EOF / { @@ -64,103 +28,28 @@ index 95749b1..10903ea 100755 + #address-cells = <1>; images { -- uboot@1 { -+ uboot-1 { + uboot-1 { description = "U-Boot (64-bit)"; + os = "u-boot"; data = /incbin/("$BL33"); type = "standalone"; arch = "arm64"; -@@ -80,7 +82,7 @@ cnt=1 - for dtname in $* - do - cat << __FDT_IMAGE_EOF -- fdt@$cnt { -+ fdt-$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; -@@ -91,8 +93,9 @@ cnt=$((cnt+1)) - done - +@@ -93,6 +95,7 @@ done cat << __HEADER_EOF -- atf@1 { -+ atf-1 { + atf-1 { description = "ARM Trusted Firmware"; + os = "arm-trusted-firmware"; data = /incbin/("$BL31"); type = "firmware"; arch = "arm64"; -@@ -104,8 +107,9 @@ __HEADER_EOF - - if [ -f $BL32 ]; then +@@ -106,6 +109,7 @@ if [ -f $BL32 ]; then cat << __HEADER_EOF -- tee@1 { -+ tee-1 { + tee-1 { description = "TEE firmware"; + os = "op-tee-firmware"; data = /incbin/("$BL32"); type = "firmware"; arch = "arm64"; -@@ -118,7 +122,7 @@ fi - - if [ -f $DEK_BLOB ]; then - cat << __HEADER_EOF -- dek_blob@1 { -+ dek_blob-1 { - description = "dek_blob"; - data = /incbin/("$DEK_BLOB"); - type = "script"; -@@ -131,7 +135,7 @@ fi - cat << __CONF_HEADER_EOF - }; - configurations { -- default = "config@1"; -+ default = "config-1"; - - __CONF_HEADER_EOF - -@@ -141,31 +145,31 @@ do - if [ -f $BL32 ]; then - if [ $ROLLBACK_INDEX_IN_FIT ]; then - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - rbindex = "$ROLLBACK_INDEX_IN_FIT"; - }; - __CONF_SECTION_EOF - else - cat << __CONF_SECTION_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION_EOF - fi - else - cat << __CONF_SECTION1_EOF -- config@$cnt { -+ config-$cnt { - description = "$(basename $dtname .dtb)"; -- firmware = "uboot@1"; -+ firmware = "uboot-1"; - loadables = $LOADABLES; -- fdt = "fdt@$cnt"; -+ fdt = "fdt-$cnt"; - }; - __CONF_SECTION1_EOF - fi -- 2.17.1 diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index c51c1e08..b4d32a54 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -2,12 +2,12 @@ DEPENDS = "zlib-native openssl-native" -SRCBRANCH = "lf-5.10.52_2.1.0" +SRCBRANCH = "lf-5.10.72_2.2.0" SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \ file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ " -SRCREV = "1112c88470f339dc631e2a7117087f416af6d6b5" +SRCREV = "7a277c8a1a21ff921d217889dde6a9f84e6d2168" S = "${WORKDIR}/git" BOOT_TOOLS = "imx-boot-tools" -- cgit v1.2.3-54-g00ecf From 5d0a08bfc461fa31886b605ceaa0cccb06bd963a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:11:09 -0600 Subject: imx-sc-firmware: Upgrade to 1.11.0 Signed-off-by: Tom Hochstein (cherry picked from commit 63748616fad1715cc8ce95c1cc776d1841b45a9c) --- .../imx-sc-firmware/imx-sc-firmware_1.10.0.bb | 41 ---------------------- .../imx-sc-firmware/imx-sc-firmware_1.11.0.bb | 41 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb create mode 100644 recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb deleted file mode 100644 index e3dad7da..00000000 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.10.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2017-2021 NXP - -DESCRIPTION = "i.MX System Controller Firmware" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" -SECTION = "BSP" - -inherit fsl-eula-unpack pkgconfig deploy - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "5c2b9d35e526136042a84e8d8f6c116e" -SRC_URI[sha256sum] = "0adc3d2c2df250a873232f1b62b14674694b50a4e01dd6ceae479e4ff2b2276b" - -BOARD_TYPE ?= "mek" -SC_FIRMWARE_NAME ?= "INVALID" -SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" -SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" - -symlink_name = "scfw_tcm.bin" - -BOOT_TOOLS = "imx-boot-tools" - -do_compile[noexec] = "1" - -do_install[noexec] = "1" - -do_deploy() { - install -Dm 0644 ${S}/${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} - ln -sf ${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${symlink_name} -} -addtask deploy after do_install - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb new file mode 100644 index 00000000..27f7a2a7 --- /dev/null +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.11.0.bb @@ -0,0 +1,41 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright (C) 2017-2021 NXP + +DESCRIPTION = "i.MX System Controller Firmware" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" +SECTION = "BSP" + +inherit fsl-eula-unpack pkgconfig deploy + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "95f1b0a148c323968c0741e807995948" +SRC_URI[sha256sum] = "4ad2999088098c7d95837b7dc88adceda319c2102c8bdf55bf6e9453653fba00" + +BOARD_TYPE ?= "mek" +SC_FIRMWARE_NAME ?= "INVALID" +SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" +SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" + +symlink_name = "scfw_tcm.bin" + +BOOT_TOOLS = "imx-boot-tools" + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +do_deploy() { + install -Dm 0644 ${S}/${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} + ln -sf ${SC_FIRMWARE_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${symlink_name} +} +addtask deploy after do_install + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" -- cgit v1.2.3-54-g00ecf From f1869d463cdb64b58f0c40cf6f822d277729667c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:37:47 -0600 Subject: imx-seco: Upgrade to 3.8.4 Signed-off-by: Tom Hochstein (cherry picked from commit 09a4f2f382aab2ee66d2dd1415b9ed580b9fbef4) --- recipes-bsp/imx-seco/imx-seco_3.8.2.bb | 26 -------------------------- recipes-bsp/imx-seco/imx-seco_3.8.4.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.2.bb create mode 100644 recipes-bsp/imx-seco/imx-seco_3.8.4.bb diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb b/recipes-bsp/imx-seco/imx-seco_3.8.2.bb deleted file mode 100644 index bd749e4f..00000000 --- a/recipes-bsp/imx-seco/imx-seco_3.8.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -SUMMARY = "NXP i.MX SECO firmware" -DESCRIPTION = "NXP i.MX Security Controller firmware" -SECTION = "base" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack use-imx-security-controller-firmware deploy - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "92a15f2ffe162374806e2dfe9b0aa2e9" -SRC_URI[sha256sum] = "c543cd3ec4d30c0cf5ee2a2f4dc7efe209363e45087e0b7c380b727b7bcf2c8a" - -do_compile[noexec] = "1" - -do_install[noexec] = "1" - -addtask deploy after do_install -do_deploy () { - # Deploy i.MX8 SECO firmware files - install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} -} - -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" diff --git a/recipes-bsp/imx-seco/imx-seco_3.8.4.bb b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb new file mode 100644 index 00000000..bd5739cd --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco_3.8.4.bb @@ -0,0 +1,26 @@ +# Copyright (C) 2019-2021 NXP + +SUMMARY = "NXP i.MX SECO firmware" +DESCRIPTION = "NXP i.MX Security Controller firmware" +SECTION = "base" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack use-imx-security-controller-firmware deploy + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "38d298cda9ea91db945b266bd6774e07" +SRC_URI[sha256sum] = "ed65381fac7a17a7594099191952821ed3f3f54c944937926dc19f82ecd8fef5" + +do_compile[noexec] = "1" + +do_install[noexec] = "1" + +addtask deploy after do_install +do_deploy () { + # Deploy i.MX8 SECO firmware files + install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} +} + +COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)" -- cgit v1.2.3-54-g00ecf From 4bb439f31d4c8b3655e87c653831e42b1492ade7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 16:37:56 -0600 Subject: imx-seco-libs: Update to 5.10.72-2.2.0 Fixes: 3e8ad6b license update 78d7375 V2XA-732, V2XA-733: update v2x test with SM4 CCM examples cf16424 V2XA-733: hsm lib: key generic crypto service 639a845 V2XA-732, V2XA-733: add SM4 CCM support and generic crypto service faa80e4 HSM-590: license update Signed-off-by: Tom Hochstein (cherry picked from commit 87f2ac6286cddd8d95de21154363dbfc36a458b1) --- recipes-bsp/imx-seco/imx-seco-libs_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 41128e28..f8c3c239 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO library" DESCRIPTION = "NXP i.MX Security Controller library" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://EULA.txt;md5=85d06b38f17b935ca11784d67075b846" +LIC_FILES_CHKSUM = "file://EULA.txt;md5=76871788f27c28af824e2ec1ca187832" DEPENDS = "zlib" -SRCBRANCH = "lf-5.10.y_2.0.0" +SRCBRANCH = "lf-5.10.72_2.2.0" SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" -SRCREV = "44caf511023012e9eda93f8bf64c90eaff1bade6" +SRCREV = "3e8ad6b168f23a8c6ecd75edabc18d2673403e24" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 3e08f619dbaed135917719387ac2f5c8dc79b701 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Jan 2022 17:57:39 -0600 Subject: imx-test: Update to 5.10.72-2.2.0 Fixes: ``` a26b1ee MLK-25735-3: ignore empty v4l2 output buffer 923cf16 MLK-25735-2: rename NV12M_8L128 to NV12MT_8L128 21c89c5 MLK-25735: mxc_v4l2_vpu_test: support display decoded picture using wayland 9d8e867 MLK-25721 mxc_v4l2_vpu_test: support more encoder input format d45624e MLK-25685 mxc_v4l2_vpu_test: avoid repeatedly release pitcher_buffer ``` Signed-off-by: Tom Hochstein (cherry picked from commit 77558f93cab8edb9dff14413f1d134159b4074ce) --- recipes-bsp/imx-test/imx-test_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index f7ef0348..d33ad18c 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -16,12 +16,12 @@ DEPENDS:append:imxvpu = " virtual/imxvpu" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "lf-5.10.52_2.1.0" +SRCBRANCH = "lf-5.10.72_2.2.0" SRC_URI = " \ git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ file://memtool_profile \ " -SRCREV = "2dcb987a91183770f328258b424d9ad2fdfdc17a" +SRCREV = "a26b1ee51177e317aa05251d4c8f10c4c68064f6" S = "${WORKDIR}/git" inherit module-base use-imx-headers -- cgit v1.2.3-54-g00ecf From 804a63b655ec99a73ebec38ef2681eb3de7260af Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 14:30:07 -0600 Subject: imx-vpu-hantro: Upgrade to 1.24.0 Signed-off-by: Tom Hochstein (cherry picked from commit ddbc40ac9cb001f1e16da218a08f3a3a43b29dbb) --- .../imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb | 35 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb deleted file mode 100644 index 427dbf92..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae" -SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "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" - -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb new file mode 100644 index 00000000..84c71610 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.24.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "1f99c6941b8a51035b52cc5bc72faa3d" +SRC_URI[sha256sum] = "aa9461a152e13a1caa852f29ae18fd33aebd90c8a2b49519003e632687fe89d6" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "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" + +COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" -- cgit v1.2.3-54-g00ecf From 8181a763a0cdd3792354fe9abc9920782e427dce Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 14:30:35 -0600 Subject: imx-vpu-hantro-daemon: Upgrade to 1.1.1 Signed-off-by: Tom Hochstein (cherry picked from commit 4d713c80302466a3d4d2b33e071cfeeb866aa548) --- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb | 31 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb | 31 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb deleted file mode 100644 index 25f54c7a..00000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb +++ /dev/null @@ -1,31 +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 = " imx-vpu-hantro-vc" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.tar.gz \ -" -SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee" -SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "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|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb new file mode 100644 index 00000000..d4a48627 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.1.bb @@ -0,0 +1,31 @@ +# 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 = " imx-vpu-hantro-vc" + +SRC_URI = " \ + ${FSL_MIRROR}/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "99e96b2e00516d56a78a95a80851076b" +SRC_URI[sha256sum] = "e7b3d55f72e233179b1b28c03628139b463d1994d140fed3c3e0796c66e917c8" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "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|mx8mm|mx8mp)" -- cgit v1.2.3-54-g00ecf From df5e6f577c325fb28c99b7e3819842bc5303bc98 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 15:33:00 -0600 Subject: imx-vpu-hantro-vc: Upgrade to 1.6.0 Signed-off-by: Tom Hochstein (cherry picked from commit abd318457243df640eaca38507c799825cfb6421) --- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb | 35 ---------------------- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb deleted file mode 100644 index e6cffaca..00000000 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -DESCRIPTION = "i.MX VC8000E Encoder library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64" -SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1" - -# SCR is the location and name of the Software Content Register file -# relative to ${D}${D_SUBDIR}. -SCR = "SCR.txt" - -do_install () { - install -d ${D}${D_SUBDIR} - cp -r ${S}/* ${D}${D_SUBDIR} - if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then - mv ${D}/usr/lib ${D}${libdir} - fi - rm ${D}${D_SUBDIR}/COPYING - if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then - bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" - fi - rm ${D}${D_SUBDIR}/${SCR} -} - -FILES:${PN} = "/" - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb new file mode 100644 index 00000000..2a17d76f --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.6.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2019-2021 NXP + +DESCRIPTION = "i.MX VC8000E Encoder library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "c24e2622c522bb4bc2da710c27389ee4" +SRC_URI[sha256sum] = "338eaa313cfa6f93eee5930903386fca922f82fda3617ecb2597cc90ccf8f22d" + +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES:${PN} = "/" + +COMPATIBLE_MACHINE = "(mx8mp)" -- cgit v1.2.3-54-g00ecf From 8f9d32da5133c3a042feb261d53b59d5a79fd593 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 16:38:27 -0600 Subject: isp-imx: Upgrade to 4.2.2.16.0 Drop the upstream patch: 0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch. Signed-off-by: Tom Hochstein (cherry picked from commit 8b46c3c6ea8a623f8cd9819ddf5e4c7cbe9d5bc9) --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 92 ------------------------------- recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb | 91 ++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 92 deletions(-) delete mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb create mode 100644 recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb 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.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb new file mode 100644 index 00000000..4411c351 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb @@ -0,0 +1,91 @@ +# Copyright 2020-2021 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" +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 \ +" + +SRC_URI[md5sum] = "f490153dbec234a04416ad41834806b2" +SRC_URI[sha256sum] = "83b24b9d1f7a40a506a45a1c5c2ef2ca2313fe9b23fde591e3b7dce77ea359ca" + +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)" -- cgit v1.2.3-54-g00ecf From 1fec151df3c6135a35024da847b48460254829fd Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 18 Jan 2022 16:46:22 -0600 Subject: basler-camera: Upgrade to 4.2.2.16.0 Signed-off-by: Tom Hochstein (cherry picked from commit 9fa3004dab003fd616fea89c5a0baf6c48ce5a72) --- recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb | 27 ------------------------- recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb | 27 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb 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.15.0.bb deleted file mode 100644 index 0122d273..00000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.15.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020-2021 NXP - -DESCRIPTION = "Basler camera binary drivers" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "963339f568e8b0ba5d67328238284d47" -SRC_URI[sha256sum] = "f4d4aa08103937ddd86b9c0880d07c1e0db1ec7f51a420a8ccc76dcf2fb7dbe6" - -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} = "file-rdeps already-stripped" - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb new file mode 100644 index 00000000..e7c8a326 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.16.0.bb @@ -0,0 +1,27 @@ +# Copyright 2020-2021 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "489763169857773bade28611e649172e" +SRC_URI[sha256sum] = "3d4ae594659a697eef7479ca2480cc53f1d460f22bcc1c58104cff63bc6705fe" + +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} = "file-rdeps already-stripped" + +COMPATIBLE_MACHINE = "(mx8mp)" -- cgit v1.2.3-54-g00ecf From 76374eaf673e7c2b5537d1cae5af390bec20773c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 7 Jan 2022 11:45:45 -0600 Subject: linux-imx-headers: Upgrade to 5.10.72 Update headers: /usr/include/imx/linux/hx280enc.h /usr/include/imx/linux/imx_vpu.h /usr/include/imx/linux/pxp_device.h /usr/include/imx/linux/pxp_dma.h Signed-off-by: Tom Hochstein (cherry picked from commit c19b675fdeb2836a07a12935ed67751641aa64fd) --- recipes-kernel/linux/linux-imx-headers_5.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-imx-headers_5.10.bb b/recipes-kernel/linux/linux-imx-headers_5.10.bb index 8acb2652..8a142b91 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.10.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.10.bb @@ -8,9 +8,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" SRCBRANCH = "lf-5.10.y" -LOCALVERSION = "-5.10.52-2.1.0" +LOCALVERSION = "-5.10.72-2.2.0" SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "ef3f2cfc6010c13feb40cfb7fd7490832cf86f45" +SRCREV = "a68e31b63f864ff71cd4adb40fbc9e1edc75c250" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf