From 250a269c30e71669693d5d98cd9174e857325ffc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 9 Jul 2024 15:21:46 -0300 Subject: [PATCH 01/30] udev-rules-imx: Use 'install -D' Signed-off-by: Otavio Salvador (cherry picked from commit a769fe5a54994fcdb9aabd7f4971c0c93588f699) Signed-off-by: Hiago De Franco --- recipes-core/udev/udev-rules-imx.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/udev/udev-rules-imx.bb b/recipes-core/udev/udev-rules-imx.bb index c42065f3a..a7c765ace 100644 --- a/recipes-core/udev/udev-rules-imx.bb +++ b/recipes-core/udev/udev-rules-imx.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = " file://10-imx.rules" do_install () { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d/ + install -D -m 0644 ${WORKDIR}/10-imx.rules \ + ${D}${sysconfdir}/udev/rules.d/10-imx.rules } From 86e931c872d358ced5eb3ac32aa010cd22e9a6be Mon Sep 17 00:00:00 2001 From: Meng Li Date: Tue, 9 Jul 2024 15:04:45 +0800 Subject: [PATCH 02/30] fmc: update patch format The code of fmc package is created in windows editer environment, and the CRLF is different from unix format, so update patch format so that apply patch smoothly. Signed-off-by: Meng Li (cherry picked from commit a43e9940547ddcd93fae81f6934b006e7b567f6e) --- ...rove-parameter-definition-of-functio.patch | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch index 06cafa72d..5769d5552 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch @@ -1,7 +1,7 @@ -From 329c8ab2770ab34d887296a35585fac53c8bedb7 Mon Sep 17 00:00:00 2001 +From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001 From: Meng Li -Date: Wed, 5 Jun 2024 18:54:22 +0800 -Subject: [PATCH] FMCCFGReader: improve parameter definition of function +Date: Tue, 9 Jul 2024 14:35:06 +0800 +Subject: [PATCH] FMCCFGReader: improve parameter definition of function errorFuncHandler When building fmc package, there is below error: @@ -30,27 +30,27 @@ index a1a87a4..c11742c 100644 --- a/source/FMCGenericError.cpp +++ b/source/FMCGenericError.cpp @@ -33,7 +33,7 @@ - #include "FMCUtils.h" - #include "logger.hpp" - --void errorFuncHandler( void * ctx, xmlErrorPtr error ) -+void errorFuncHandler( void * ctx, const xmlError *error ) - { - char *filestr = (char*)""; - char *msgstr = (char*)""; + #include "FMCUtils.h" + #include "logger.hpp" + +-void errorFuncHandler( void * ctx, xmlErrorPtr error ) ++void errorFuncHandler( void * ctx, const xmlError *error ) + { + char *filestr = (char*)""; + char *msgstr = (char*)""; diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h index 504a81b..61ab6c1 100644 --- a/source/FMCGenericError.h +++ b/source/FMCGenericError.h @@ -35,7 +35,7 @@ - - const int NO_LINE = -1; - --void errorFuncHandler( void * ctx, xmlErrorPtr error ); -+void errorFuncHandler( void * ctx, const xmlError *error ); - - - class CGenericError { + + const int NO_LINE = -1; + +-void errorFuncHandler( void * ctx, xmlErrorPtr error ); ++void errorFuncHandler( void * ctx, const xmlError *error ); + + + class CGenericError { -- 2.34.1 From fbff9dd1445a3113fdc94ebc9a3626970f166bd8 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Thu, 25 Jul 2024 15:39:55 -0300 Subject: [PATCH 03/30] imx-alsa-plugins: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update to the new branch, for now the same hash is being used. Signed-off-by: Hiago De Franco (cherry picked from commit 8365eb75a4e9e417b1cbc64ab51fa0c526577e15) --- recipes-multimedia/alsa/imx-alsa-plugins_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index e2acf7676..faa417686 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb @@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers PV = "1.0.26+${SRCPV}" SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331" S = "${WORKDIR}/git" From 94c5a37be31b3943cf7a99c94ae11dd4f5030d04 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Sat, 27 Jul 2024 12:21:01 -0300 Subject: [PATCH 04/30] recipes-bsp: introduce imx-oei recipe OEI stands for "Optional Executable Image", it was relased for NXP BSP 6.6.23-2.0.0. The OEI Firmware is required for the i.MX 95 SoC. Signed-off-by: Hiago De Franco (cherry picked from commit 61beaf5861f2bde6158788db37a6c1c54c971d1a) --- recipes-bsp/imx-oei/imx-oei_1.0.0.bb | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 recipes-bsp/imx-oei/imx-oei_1.0.0.bb diff --git a/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/recipes-bsp/imx-oei/imx-oei_1.0.0.bb new file mode 100644 index 000000000..a853a803a --- /dev/null +++ b/recipes-bsp/imx-oei/imx-oei_1.0.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "i.MX Optional Execution Image" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "gcc-arm-none-eabi-native" + +SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}" +IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https" +SRCBRANCH = "master" +SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678" + +S = "${WORKDIR}/git" + +inherit deploy + +OEI_CONFIGS ?= "UNDEFINED" +OEI_CORE ?= "UNDEFINED" +OEI_SOC ?= "UNDEFINED" +OEI_BOARD ?= "UNDEFINED" + +LDFLAGS[unexport] = "1" + +EXTRA_OEMAKE = "\ + board=${OEI_BOARD} \ + DEBUG=1 \ + OEI_CROSS_COMPILE=arm-none-eabi-" + +do_configure() { + for oei_config in ${OEI_CONFIGS}; do + oe_runmake clean oei=$oei_config + done +} + +do_compile() { + for oei_config in ${OEI_CONFIGS}; do + oe_runmake oei=$oei_config + done +} + +do_install() { + install -d ${D}/firmware + for oei_config in ${OEI_CONFIGS}; do + install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware + done +} + +addtask deploy after do_install +do_deploy() { + cp -rf ${D}/firmware/* ${DEPLOYDIR}/ +} + +FILES:${PN} = "/firmware" +SYSROOT_DIRS += "/firmware" + +COMPATIBLE_MACHINE = "(mx95-generic-bsp)" From 313b97767ccd43ea2260ba58565260a40f649a15 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Fri, 26 Jul 2024 17:13:24 -0300 Subject: [PATCH 05/30] imx-mkimage: imx-boot: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update recipes to NXP BSP version 6.6.23-2.0.0. This commit introduces the 'imx95' target. Signed-off-by: Hiago De Franco (cherry picked from commit d4d7d9a80e471dfd70d738091ee256c0c64ff071) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 59 ++++++++++++++++++++- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 6 +-- 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 0bb7dd95a..2c9642147 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -41,6 +41,9 @@ do_compile[depends] += " \ SC_FIRMWARE_NAME ?= "scfw_tcm.bin" +OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'imx-oei', 'YES', 'NO', d)}" +OEI_NAME ?= "oei-${OEI_CORE}-*.bin" + ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin" ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" @@ -60,6 +63,7 @@ BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M" BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX" BOOT_STAGING:mx91p-generic-bsp = "${S}/iMX91" BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93" +BOOT_STAGING:mx95-generic-bsp = "${S}/iMX95" SOC_FAMILY = "INVALID" SOC_FAMILY:mx8-generic-bsp = "mx8" @@ -68,10 +72,25 @@ SOC_FAMILY:mx8x-generic-bsp = "mx8x" SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp" SOC_FAMILY:mx91p-generic-bsp = "mx93" SOC_FAMILY:mx93-generic-bsp = "mx93" +SOC_FAMILY:mx95-generic-bsp = "mx95" REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}" UBOOT_DTB_BINARY ?= "u-boot.dtb" +MKIMAGE_EXTRA_ARGS ?= "" +MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \ + OEI=${OEI_ENABLE} \ + LPDDR_TYPE=${DDR_TYPE} \ + ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}" +MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \ + ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \ + QSPI_HEADER=./scripts/fspi_header_133" + +do_uboot_assemble_fitimage:prepend:imx-generic-bsp() { + for config in ${UBOOT_MACHINE}; do + mkdir -p ${B}/${config} + done +} compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build @@ -153,12 +172,29 @@ compile_mx93() { fi } +compile_mx95() { + bbnote i.MX 95 boot binary build + compile_mx93 + + cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \ + ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin +} + do_compile() { # mkimage for i.MX8 # Copy TEE binary to SoC target folder to mkimage if ${DEPLOY_OPTEE}; then cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING} + if ${DEPLOY_OPTEE_STMM}; then + # Copy tee.bin to tee.bin-stmm + cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm + fi fi + # Copy OEI firmware to SoC target folder to mkimage + if [ "${OEI_ENABLE}" = "YES" ]; then + cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING} + fi + for type in ${UBOOT_CONFIG}; do if [ "${@d.getVarFlags('UBOOT_DTB_NAME')}" = "None" ]; then UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}" @@ -190,9 +226,16 @@ do_compile() { # Special target build for i.MX 8DXL with V2X off bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME_EXTRA} flash_linux_m4 + elif [[ $target == *sttm_capsule ]]; then + # target for flash_evk_stmm_capsule or + # flash_singleboot_stmm_capsule + cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING} + bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}" + cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING} + make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target} else - bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}" - make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME_EXTRA} ${target} + bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}" + make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${target} fi if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} @@ -291,6 +334,12 @@ deploy_mx93() { fi } +deploy_mx95() { + deploy_mx93 + install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \ + ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin +} + do_deploy() { deploy_${SOC_FAMILY} @@ -298,6 +347,12 @@ do_deploy() { if ${DEPLOY_OPTEE}; then install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS} fi + + # copy oei to deploy path + if [ "${OEI_ENABLE}" = "YES" ]; then + install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + fi + # copy makefile (soc.mak) for reference install -m 0644 ${BOOT_STAGING}/soc.mak ${DEPLOYDIR}/${BOOT_TOOLS} diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index fb3df750a..9b03d3924 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -1,12 +1,12 @@ -# Copyright 2017-2022 NXP +# Copyright 2017-2023 NXP DEPENDS = "zlib-native openssl-native" SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ " -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "cbb99377cc2bb8f7cf213794c030e1c60423ef1f" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "ca5d6b2d3fd9ab15825b97f7ef6f1ce9a8644966" S = "${WORKDIR}/git" From 02d4144b31fe15a6963ce92b9c2011ca0af73282 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Mon, 29 Jul 2024 13:57:40 -0300 Subject: [PATCH 06/30] imx-lib: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update the imx-lib branch to the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit 7e6dcb999bd8a82c18ec764200b7a63866ac8dcf) --- recipes-bsp/imx-lib/imx-lib_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d06ccfa10..9c9db88bc 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -13,7 +13,7 @@ PE = "1" PV = "5.9+${SRCPV}" SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.6.3_1.0.0" +SRCBRANCH = "lf-6.6.23_2.0.0" SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547" S = "${WORKDIR}/git" From a1a511c1a37070f2525769c6d8808d539d661ced Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Mon, 29 Jul 2024 14:15:53 -0300 Subject: [PATCH 07/30] kernel-module-nxp-wlan: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update mwifiex to the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit f649ad89c60f8075de3a18b03f8fbdb37074bcbc) --- .../kernel-modules/kernel-module-nxp-wlan_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb index 48e9cc3bc..453fdd48c 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb @@ -1,6 +1,6 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" # For backwards compatibility PROVIDES += "kernel-module-nxp89xx" @@ -8,12 +8,12 @@ RREPLACES:${PN} = "kernel-module-nxp89xx" RPROVIDES:${PN} = "kernel-module-nxp89xx" RCONFLICTS:${PN} = "kernel-module-nxp89xx" -SRCBRANCH = "lf-6.6.3_1.0.0" +SRCBRANCH = "lf-6.6.23_2.0.0" MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" -SRCREV = "a84df583155bad2a396a937056805550bdf655ab" +SRCREV = "88372772badbf30152b3ad12ae251dc567095cab" -S = "${WORKDIR}/git/mxm_wifiex/wlan_src" +S = "${WORKDIR}/git" inherit module From 5272f30ee3a15f19e9fded5a77c69e714e04332c Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Mon, 29 Jul 2024 14:36:21 -0300 Subject: [PATCH 08/30] firmware-nxp-wifi: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update to the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit a3ca0c98aba5bd3b8f9513df5a0bfde3c92883b2) --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index d28b23821..c425173c0 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -7,11 +7,11 @@ should be preferred." SECTION = "kernel" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a" SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "7e038c6afba3118bcee91608764ac3c633bce0c4" S = "${WORKDIR}/git" @@ -150,6 +150,7 @@ FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \ ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \ ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \ + ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \ " RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common" RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" From 868ab6bc9c4b1553c2f990712e26fffc8b976cd5 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Mon, 29 Jul 2024 14:51:29 -0300 Subject: [PATCH 09/30] imx-seco: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update imx-seco to the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit 4737cf7998efc986463a9242f821237db6e26cb4) --- .../imx-seco/{imx-seco_5.9.0.bb => imx-seco_5.9.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-bsp/imx-seco/{imx-seco_5.9.0.bb => imx-seco_5.9.4.bb} (73%) diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb similarity index 73% rename from recipes-bsp/imx-seco/imx-seco_5.9.0.bb rename to recipes-bsp/imx-seco/imx-seco_5.9.4.bb index f7dadea57..14b15da29 100644 --- a/recipes-bsp/imx-seco/imx-seco_5.9.0.bb +++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb @@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware" DESCRIPTION = "Firmware for i.MX Security Controller Subsystem" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" inherit fsl-eula-unpack use-imx-security-controller-firmware deploy SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "b722a534c4d3cc90270e05eaa812514d" -SRC_URI[sha256sum] = "c3bd761f457e939035b01a0ab36e79064a2a1bc6c3cdb3cd847f7f38df0964df" +SRC_URI[md5sum] = "d05d6b15ad9ad0df141e1fc736f4a622" +SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7" do_compile[noexec] = "1" From 69f27f95d9eba993e734b89d40aad5221810926b Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Thu, 1 Aug 2024 16:56:38 -0300 Subject: [PATCH 10/30] recipes-multimedia: imx-*: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update the following recipes to NXP BSP 6.6.23-2.0.0: - imx-codec 4.9.0 - imx-dsp 2.1.8 - imx-parser 4.9.0 - imx-vpuwrap (branch MM_04.09.00_2405_L6.6.y) Signed-off-by: Hiago De Franco (cherry picked from commit 998dfdfc16433124a266a02fbfe4241759106332) --- ...{imx-codec_4.8.3.bb => imx-codec_4.9.0.bb} | 6 ++-- ...xt_2.1.7.bb => imx-dsp-codec-ext_2.1.8.bb} | 6 ++-- .../{imx-dsp_2.1.7.bb => imx-dsp_2.1.8.bb} | 6 ++-- ...mx-parser_4.8.3.bb => imx-parser_4.9.0.bb} | 6 ++-- ...ro_VCencoder-add-sys-time.h-for-gett.patch | 31 +++++++++++++++++++ .../imx-vpuwrap/imx-vpuwrap_git.bb | 7 +++-- 6 files changed, 47 insertions(+), 15 deletions(-) rename recipes-multimedia/imx-codec/{imx-codec_4.8.3.bb => imx-codec_4.9.0.bb} (95%) rename recipes-multimedia/imx-dsp/{imx-dsp-codec-ext_2.1.7.bb => imx-dsp-codec-ext_2.1.8.bb} (80%) rename recipes-multimedia/imx-dsp/{imx-dsp_2.1.7.bb => imx-dsp_2.1.8.bb} (89%) rename recipes-multimedia/imx-parser/{imx-parser_4.8.3.bb => imx-parser_4.9.0.bb} (87%) create mode 100644 recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb similarity index 95% rename from recipes-multimedia/imx-codec/imx-codec_4.8.3.bb rename to recipes-multimedia/imx-codec/imx-codec_4.9.0.bb index 0a2c71e76..761345ce7 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb @@ -5,14 +5,14 @@ DESCRIPTION = "Freescale Multimedia codec libs" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" # Backward compatibility PROVIDES += "libfslcodec" SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "7ae1615aad2c0456b9be2ab804a6267e" -SRC_URI[sha256sum] = "9facb3541903b4a6c6baa906f8c2c6cc01fc8c7b82a726c8da6d3681d4ed720b" +SRC_URI[md5sum] = "2208aa871e51aacf1910c59c24694572" +SRC_URI[sha256sum] = "1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a" inherit fsl-eula-unpack autotools pkgconfig diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb similarity index 80% rename from recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb rename to recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb index bc73bd9f9..87cc0b302 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb @@ -2,14 +2,14 @@ DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" inherit fsl-eula-unpack autotools pkgconfig SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "32251bc952ca7b9a4b12fadb9328a8c1" -SRC_URI[sha256sum] = "0baa82410a77c68e39aaa987d91b41c94255d62294fa2f5a399169f3068862cc" +SRC_URI[md5sum] = "4250b61f23f49de9500ea8208f6e2be9" +SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3" EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp" EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp" diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb similarity index 89% rename from recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb rename to recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb index 60761e6e1..d260c8167 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb @@ -2,15 +2,15 @@ DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" inherit fsl-eula-unpack autotools pkgconfig SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "199f88716f289e93e0954fa6475a3cbc" -SRC_URI[sha256sum] = "83eaef592de33b4d5e8fae63d798cc955bf3c414911c87afeb65a20af01fb0b6" +SRC_URI[md5sum] = "6699e619f941cfa2e2b99cc2a99b7575" +SRC_URI[sha256sum] = "5d42c8f39fb36bcc48e9f0c4caffd125b89c257fa8eccb3b61608bc690a16462" EXTRA_OECONF = " \ -datadir=${base_libdir}/firmware \ diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb similarity index 87% rename from recipes-multimedia/imx-parser/imx-parser_4.8.3.bb rename to recipes-multimedia/imx-parser/imx-parser_4.9.0.bb index 4e580085f..4bbf6dfb6 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.9.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Freescale Multimedia parser libs" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" # For backwards compatibility PROVIDES += "libfslparser" @@ -14,8 +14,8 @@ RPROVIDES:${PN} = "libfslparser" RCONFLICTS:${PN} = "libfslparser" SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "9bca484287f5592b86ed10c1761a3fcc" -SRC_URI[sha256sum] = "b25267eefb4618b2ba8d6aba46a5b4e09621a44115036fc896e0777006472043" +SRC_URI[md5sum] = "700b4cf3ba547dc740a064787f528af0" +SRC_URI[sha256sum] = "2f0fc3955f824936c359b3cb738549213823b0c366b2362bba593058da745677" inherit fsl-eula-unpack autotools pkgconfig diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch new file mode 100644 index 000000000..ab8b50de4 --- /dev/null +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch @@ -0,0 +1,31 @@ +From a57daf8f58cf69be06de8ebc9eab3a3077143760 Mon Sep 17 00:00:00 2001 +From: Hiago De Franco +Date: Fri, 26 Jul 2024 14:43:55 -0300 +Subject: [PATCH] vpu_wrapper_hantro_VCencoder: add sys/time.h for gettimeofday + +Fixes: +| ../git/vpu_wrapper_hantro_VCencoder.c:1965:5: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration] +| 1965 | gettimeofday (&pObj->tvBegin, NULL); +| | ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/nxp-imx/imx-vpuwrap/pull/2] +Signed-off-by: Hiago De Franco +--- + vpu_wrapper_hantro_VCencoder.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vpu_wrapper_hantro_VCencoder.c b/vpu_wrapper_hantro_VCencoder.c +index efae31a77ca4..6185cfc067d1 100755 +--- a/vpu_wrapper_hantro_VCencoder.c ++++ b/vpu_wrapper_hantro_VCencoder.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.39.2 + diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb index bae9c928b..f7a8e3521 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Freescale Multimedia VPU wrapper" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" DEPENDS = "virtual/imxvpu" DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" @@ -13,9 +13,10 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" SRC_URI = " \ git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \ file://0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch \ + file://0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch \ " -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "f974cecdb00b4a214e4b5229f2279e772ee43306" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b" S = "${WORKDIR}/git" From 7a03a4b51eb54f52897f00a77fdfb96c565ea7a0 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Fri, 26 Jul 2024 17:55:45 -0300 Subject: [PATCH 11/30] gstreamer: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Upgrade gstreamer and all related recipes to 1.24.0, syncing with meta-imx layer. Signed-off-by: Hiago De Franco (cherry picked from commit d1c6878cf25575f98ab12c5e685a0728afa4424a) --- conf/machine/include/imx-base.inc | 40 +++---- ...mx.bb => gstreamer1.0-libav_1.24.0.imx.bb} | 12 +- ...issing-opencv-data-dir-in-yocto-buil.patch | 33 ------ ...=> gstreamer1.0-plugins-bad_1.24.0.imx.bb} | 13 ++- .../0001-gstallocator-Fix-typcasts.patch | 47 -------- ...gstreamer1.0-plugins-base_1.24.%.bbappend} | 4 +- ...> gstreamer1.0-plugins-base_1.24.0.imx.bb} | 6 +- ...> gstreamer1.0-plugins-good_1.24.0.imx.bb} | 4 +- .../gstreamer1.0-plugins-imx_2.2.0.bb | 2 +- ...> gstreamer1.0-plugins-ugly_1.24.0.imx.bb} | 16 ++- ...1-meson.build-Fix-missing-python_opt.patch | 47 ++++++++ ...x.bb => gstreamer1.0-python_1.24.0.imx.bb} | 13 ++- ...=> gstreamer1.0-rtsp-server_1.24.0.imx.bb} | 13 ++- ...mx.bb => gstreamer1.0-vaapi_1.24.0.imx.bb} | 10 +- ...ts-add-support-for-install-the-tests.patch | 34 +++--- ...s-use-a-dictionaries-for-environment.patch | 21 ++-- ...er-script-to-run-the-installed_tests.patch | 36 +++--- ...bin-test_watch_for_state_change-test.patch | 107 ------------------ ...22.5.imx.bb => gstreamer1.0_1.24.0.imx.bb} | 8 +- ...demux-Fix-type-of-USER_DATA_LOCATION.patch | 33 ------ ...ude-glib-gprintf.h-for-g_printf-prot.patch | 28 ----- .../0003-grecorder-Fix-build-with-clang.patch | 44 ------- ...urn-0-instead-of-NULL-for-a-function.patch | 87 -------------- ...iurstreamcache-Include-gst-gstinfo.h.patch | 28 ----- ...x-typecast-warnings-found-with-clang.patch | 61 ---------- ...07-gstimxv4l2-Fix-typecasting-errors.patch | 30 ----- ...e-beep_register_external_typefinders.patch | 32 ------ ...-incompatible-integer-to-pointer-con.patch | 41 ------- ...ion-for-aiur_register_external_typef.patch | 28 ----- .../gstreamer/imx-gst1.0-plugin_git.bb | 16 +-- 30 files changed, 184 insertions(+), 710 deletions(-) rename recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.22.5.imx.bb => gstreamer1.0-libav_1.24.0.imx.bb} (75%) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.22.5.imx.bb => gstreamer1.0-plugins-bad_1.24.0.imx.bb} (97%) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.22.%.bbappend => gstreamer1.0-plugins-base_1.24.%.bbappend} (88%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.22.5.imx.bb => gstreamer1.0-plugins-base_1.24.0.imx.bb} (97%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.22.5.imx.bb => gstreamer1.0-plugins-good_1.24.0.imx.bb} (98%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.22.5.imx.bb => gstreamer1.0-plugins-ugly_1.24.0.imx.bb} (75%) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch rename recipes-multimedia/gstreamer/{gstreamer1.0-python_1.22.5.imx.bb => gstreamer1.0-python_1.24.0.imx.bb} (66%) rename recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.22.5.imx.bb => gstreamer1.0-rtsp-server_1.24.0.imx.bb} (73%) rename recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.22.5.imx.bb => gstreamer1.0-vaapi_1.24.0.imx.bb} (89%) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch rename recipes-multimedia/gstreamer/{gstreamer1.0_1.22.5.imx.bb => gstreamer1.0_1.24.0.imx.bb} (96%) delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch delete mode 100644 recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b94be957b..8ef1e2819 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -510,28 +510,28 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" # GStreamer forked recipes -PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx" +PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" # GStreamer copied recipes -PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.22.5.imx" -PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.22.5.imx" +PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" # GStreamer downgrade ffmpeg PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb similarity index 75% rename from recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb index cca80cc27..ab542cb53 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb @@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ " -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.5.tar.xz" -SRC_URI[sha256sum] = "8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a" +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz" +SRC_URI[sha256sum] = "ab775d5b9a7c84176b29822b68c7a34731280039a20b7db5eb639eddd1466178" -S = "${WORKDIR}/gst-libav-1.22.5" +S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" @@ -24,5 +24,11 @@ EXTRA_OEMESON += " \ -Dtests=disabled \ " +# Drop .imx from PV +def get_gst_ver(v): + return oe.utils.trim_version(v, 3) + FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch deleted file mode 100644 index 029b80e17..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin -Date: Mon, 27 Jan 2020 10:22:35 +0000 -Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build - -When Yocto build is performed, opencv searches for data dir using simple -'test' command, this fails because pkg-config provides an absolute -path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR -in order for the 'test' utility to pick up the absolute path. - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andrey Zhizhikin -Signed-off-by: Jose Quaresma - ---- - ext/opencv/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index 1d86b90..b5c8b95 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -87,6 +87,9 @@ if opencv_found - opencv_prefix = opencv_dep.get_variable('prefix') - gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] - -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() -+ opencv_prefix = pkgconf_sysroot + opencv_prefix -+ - # Check the data dir used by opencv for its xml data files - # Use prefix from pkg-config to be compatible with cross-compilation - r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb similarity index 97% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb index 3366a6274..c73491f50 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb @@ -184,11 +184,13 @@ DEPENDS:append:imxgpu2d = " virtual/libg2d" SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ - file://0002-avoid-including-sys-poll.h-directly.patch" + file://0002-avoid-including-sys-poll.h-directly.patch \ + file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ + " SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "9de821c50b4dd7af2407d9c3d078020704510a20" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98" S = "${WORKDIR}/git" @@ -215,8 +217,11 @@ EXTRA_OEMESON += " \ -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ " -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" +EXTRA_OEMESON:remove = " \ + -Dkate=disabled \ +" +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" # it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE # TOOLCHAIN = "gcc" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch deleted file mode 100644 index 3ab4bab45..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 90b94ff95c72487054fd283fb7cb5ebd13822b3f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 7 Aug 2023 18:56:05 -0700 -Subject: [PATCH] gstallocator: Fix typcasts - -These are found when building with clang+musl -| ../git/gst-libs/gst/allocators/gstallocatorphymem.c:228:10: error: incompatible pointer to integer conversion returning 'gpointer' (aka 'void *') from a function with result type 'guintptr -' (aka 'unsigned long') [-Wint-conversion] -| 228 | return gst_phymem_get_phy (mem); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-base/pull/4] -Signed-off-by: Khem Raj ---- - gst-libs/gst/allocators/gstallocatorphymem.c | 2 +- - gst-libs/gst/gl/gstglphymemory.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/gst/allocators/gstallocatorphymem.c b/gst-libs/gst/allocators/gstallocatorphymem.c -index f3c3306c7..f8a4511ab 100755 ---- a/gst-libs/gst/allocators/gstallocatorphymem.c -+++ b/gst-libs/gst/allocators/gstallocatorphymem.c -@@ -225,7 +225,7 @@ static guintptr - gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator, - GstMemory * mem) - { -- return gst_phymem_get_phy (mem); -+ return (guintptr)gst_phymem_get_phy (mem); - } - - static void -diff --git a/gst-libs/gst/gl/gstglphymemory.c b/gst-libs/gst/gl/gstglphymemory.c -index d82c9a66a..1d8be0a5d 100644 ---- a/gst-libs/gst/gl/gstglphymemory.c -+++ b/gst-libs/gst/gl/gstglphymemory.c -@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (GstAllocator * allocator, - GST_VIDEO_INFO_HEIGHT (info), - viv_fmt, - memblk->vaddr, -- memblk->paddr, -+ (guint)memblk->paddr, - FALSE - }; - --- -2.41.0 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend similarity index 88% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend index ca6636b83..a834192eb 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend @@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \ # does not depend on the viv-fb feature. It used to, but that was actually a bug # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) -PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb " -PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb " +PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb " +PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb " diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb similarity index 97% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb index 944cf8f5e..348a30dc5 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb @@ -116,10 +116,10 @@ SRC_URI:remove = " \ file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " -SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch" + GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "c4333767ea122c182ba4e14cababe8dbe2a1b882" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb similarity index 98% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb index 1234f3ad4..5d5a2425c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb @@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "d361360510c97dc23abbfcdd22dff8214890527d" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3" # set 32bit compile timer for 32-bit platform GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb index 5bf60e623..f09a5bc77 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb @@ -15,7 +15,7 @@ RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser PV .= "+git${SRCPV}" SRCBRANCH ?= "master" -SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288" +SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387" SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb similarity index 75% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb index bdc802c2c..19e9ce047 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb @@ -12,11 +12,11 @@ LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LICENSE_FLAGS = "commercial" SRC_URI = " \ - https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz \ + https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \ " -SRC_URI[sha256sum] = "2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54" +SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5" -S = "${WORKDIR}/gst-plugins-ugly-1.22.5" +S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}" DEPENDS += "gstreamer1.0-plugins-base" @@ -24,10 +24,9 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ + a52dec mpeg2dec \ " -PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" -PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread" @@ -41,5 +40,10 @@ EXTRA_OEMESON += " \ -Dsidplay=disabled \ " -FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" +# Drop .imx from PV +def get_gst_ver(v): + return oe.utils.trim_version(v, 3) + FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch new file mode 100644 index 000000000..fd6b1c16e --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch @@ -0,0 +1,47 @@ +From 8d7e2eaed10e2928358805f613223a6a149790d6 Mon Sep 17 00:00:00 2001 +From: Hiago De Franco +Date: Wed, 31 Jul 2024 11:51:06 -0300 +Subject: [PATCH] meson.build: Fix missing python_opt + +'python_opt' was not declared earlier, giving the following build error: + +| Message: python_abi_flags = +| +| ../gst-python-1.24.0/meson.build:84:16: ERROR: Unknown variable "python_opt". + +Remove it and keep the error message. + +Upstream-Status: Inappropriate [oe specific] + +The patch already exists upstream, but this is related to another fix [1] +not suitable for OE. Moreover, the backport does not apply since +the patch was added to the gstreamer monorepo. + +[1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734? + +Signed-off-by: Hiago De Franco +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index f240b6fd8aca..53f7a43702c7 100644 +--- a/meson.build ++++ b/meson.build +@@ -80,12 +80,7 @@ foreach loc: pylib_locs + endforeach + endforeach + if pylib_fname == '' +- error_msg = 'Could not find python library to load' +- if python_opt.enabled() +- error(error_msg) +- else +- message(error_msg) +- endif ++ message('Could not find python library to load') + endif + + pygi_override_dir = get_option('pygi-overrides-dir') +-- +2.39.2 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb similarity index 66% rename from recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb index ebad6b640..0ba9a1aea 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb @@ -7,15 +7,18 @@ SECTION = "multimedia" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-1.22.5.tar.xz" -SRC_URI[sha256sum] = "bf05232415cf6018142ae51dd3b897bb73432687b5ce1786bf46edc6298ce5b0" +SRC_URI = "\ + https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz \ + file://0001-meson.build-Fix-missing-python_opt.patch \ + " +SRC_URI[sha256sum] = "041c2255c1ea9936c777dcb08a36ecaa6a24a69a12fc46ef53f1530d46c59f9d" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" PNREAL = "gst-python" -S = "${WORKDIR}/${PNREAL}-1.22.5" +S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}" EXTRA_OEMESON += "\ -Dtests=disabled \ @@ -25,6 +28,10 @@ EXTRA_OEMESON += "\ inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check +# Drop .imx from PV +def get_gst_ver(v): + return oe.utils.trim_version(v, 3) + FILES:${PN} += "${libdir}/gstreamer-1.0" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb similarity index 73% rename from recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb index 5dae5ebb1..c866d2332 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb @@ -8,11 +8,11 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" PNREAL = "gst-rtsp-server" -SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-1.22.5.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz" -SRC_URI[sha256sum] = "f343eb54964ebd4d8c071be5eecad586f28feb0156e036e06b148d0e7febb1c0" +SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b" -S = "${WORKDIR}/${PNREAL}-1.22.5" +S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}" inherit meson pkgconfig upstream-version-is-even gobject-introspection @@ -25,7 +25,14 @@ EXTRA_OEMESON += " \ GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" +# Drop .imx from PV +def get_gst_ver(v): + return oe.utils.trim_version(v, 3) + # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well require gstreamer1.0-plugins-packaging.inc CVE_PRODUCT += "gst-rtsp-server" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb similarity index 89% rename from recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb index d44b70a8d..dde7b5b1d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb @@ -9,15 +9,19 @@ REALPN = "gstreamer-vaapi" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.22.5.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.24.0.tar.xz" -SRC_URI[sha256sum] = "a9a550267c9584df0e8c70434d30476e8fd0018b733c1c1ee33deaf422bdb24b" +SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596" -S = "${WORKDIR}/${REALPN}-1.22.5" +S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" inherit meson pkgconfig features_check upstream-version-is-even +# Drop .imx from PV +def get_gst_ver(v): + return oe.utils.trim_version(v, 3) + REQUIRED_DISTRO_FEATURES ?= "opengl" EXTRA_OEMESON += " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index 568e38cbf..456f07626 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch @@ -1,4 +1,4 @@ -From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 +From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH] tests: add support for install the tests @@ -14,16 +14,16 @@ Signed-off-by: Jose Quaresma --- meson.build | 4 ++++ meson_options.txt | 1 + - tests/check/meson.build | 22 +++++++++++++++++++++- + tests/check/meson.build | 21 ++++++++++++++++++++- tests/check/template.test.in | 3 +++ - 4 files changed, 29 insertions(+), 1 deletion(-) + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tests/check/template.test.in diff --git a/meson.build b/meson.build -index f9f591d..3906fb3 100644 +index 540d6d290e10..0267f22a79ea 100644 --- a/meson.build +++ b/meson.build -@@ -606,6 +606,10 @@ if bashcomp_dep.found() +@@ -624,6 +624,10 @@ if bashcomp_dep.found() endif endif @@ -35,10 +35,10 @@ index f9f591d..3906fb3 100644 pkgconfig = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt -index 7363bdb..a34ba37 100644 +index 340fb5801d02..5b87f68e8d7f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso +@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso option('memory-alignment', type: 'combo', choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], value: 'malloc') @@ -47,14 +47,14 @@ index 7363bdb..a34ba37 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') diff --git a/tests/check/meson.build b/tests/check/meson.build -index 16caac7..f2d400f 100644 +index e9501feb2af5..fd5a99611e3d 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -124,10 +124,16 @@ test_defines = [ +@@ -125,10 +125,16 @@ test_defines = [ '-UG_DISABLE_ASSERT', '-UG_DISABLE_CAST_CHECKS', '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', -- '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"', +- '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', '-DGST_DISABLE_DEPRECATED', ] @@ -68,7 +68,7 @@ index 16caac7..f2d400f 100644 # sanity checking if get_option('check').disabled() if get_option('tests').enabled() -@@ -150,6 +156,8 @@ foreach t : core_tests +@@ -151,6 +157,8 @@ foreach t : core_tests include_directories : [configinc], link_with : link_with_libs, dependencies : gst_deps + test_deps, @@ -77,10 +77,10 @@ index 16caac7..f2d400f 100644 ) env = environment() -@@ -161,6 +169,18 @@ foreach t : core_tests +@@ -161,6 +169,17 @@ foreach t : core_tests + env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') - + if installed_tests_enabled + test_conf = configuration_data() + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) @@ -92,16 +92,18 @@ index 16caac7..f2d400f 100644 + configuration: test_conf + ) + endif -+ + test(test_name, exe, env: env, timeout : 3 * 60) endif - endforeach diff --git a/tests/check/template.test.in b/tests/check/template.test.in new file mode 100644 -index 0000000..f701627 +index 000000000000..f701627f87a6 --- /dev/null +++ b/tests/check/template.test.in @@ -0,0 +1,3 @@ +[Test] +Type=session +Exec=@installed_tests_dir@/@program@ +-- +2.39.2 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch index 10a6dcc61..83f3870c4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch @@ -1,4 +1,4 @@ -From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 +From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sat, 24 Apr 2021 10:34:47 +0100 Subject: [PATCH 3/4] tests: use a dictionaries for environment @@ -10,14 +10,14 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- Signed-off-by: Jose Quaresma --- - subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- - 1 file changed, 13 insertions(+), 8 deletions(-) + tests/check/meson.build | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 00a138a568..48ec2532f8 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build -@@ -161,14 +161,19 @@ foreach t : core_tests +diff --git a/tests/check/meson.build b/tests/check/meson.build +index fd5a99611e3d..330abaaeadd5 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build +@@ -161,14 +161,20 @@ foreach t : core_tests install: installed_tests_enabled, ) @@ -42,9 +42,10 @@ index 00a138a568..48ec2532f8 100644 + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', + } - ++ if installed_tests_enabled test_conf = configuration_data() + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) -- -2.33.1 +2.39.2 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch index efa004f8c..0a312389e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch @@ -1,4 +1,4 @@ -From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001 +From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 2 May 2021 01:58:01 +0100 Subject: [PATCH 4/4] tests: add helper script to run the installed_tests @@ -11,16 +11,16 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- Signed-off-by: Jose Quaresma --- - subprojects/gstreamer/tests/check/meson.build | 17 +++++++++++++++++ - .../gstreamer/tests/check/template.sh.in | 9 +++++++++ - .../gstreamer/tests/check/template.test.in | 2 +- + tests/check/meson.build | 17 +++++++++++++++++ + tests/check/template.sh.in | 9 +++++++++ + tests/check/template.test.in | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) - create mode 100755 subprojects/gstreamer/tests/check/template.sh.in + create mode 100644 tests/check/template.sh.in -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 48ec2532f8..7dc4990d4e 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build +diff --git a/tests/check/meson.build b/tests/check/meson.build +index 330abaaeadd5..5d383b14dc29 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build @@ -185,6 +185,23 @@ foreach t : core_tests install_dir: installed_tests_metadir, configuration: test_conf @@ -45,11 +45,11 @@ index 48ec2532f8..7dc4990d4e 100644 endif test(test_name, exe, env: env, timeout : 3 * 60) -diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in -new file mode 100755 -index 0000000000..cf7d31b0ea +diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in +new file mode 100644 +index 000000000000..cf7d31b0ea5f --- /dev/null -+++ b/subprojects/gstreamer/tests/check/template.sh.in ++++ b/tests/check/template.sh.in @@ -0,0 +1,9 @@ +#!/bin/sh + @@ -60,15 +60,15 @@ index 0000000000..cf7d31b0ea +GST_REGISTRY=@GST_REGISTRY@ +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" +exec @TEST@ -diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in -index f701627f87..b74ef6ad73 100644 ---- a/subprojects/gstreamer/tests/check/template.test.in -+++ b/subprojects/gstreamer/tests/check/template.test.in +diff --git a/tests/check/template.test.in b/tests/check/template.test.in +index f701627f87a6..b74ef6ad732a 100644 +--- a/tests/check/template.test.in ++++ b/tests/check/template.test.in @@ -1,3 +1,3 @@ [Test] Type=session -Exec=@installed_tests_dir@/@program@ +Exec=@installed_tests_dir@/@program@.sh -- -2.33.1 +2.39.2 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch deleted file mode 100644 index f51df6d20..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch +++ /dev/null @@ -1,107 +0,0 @@ -From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001 -From: Claudius Heine -Date: Wed, 2 Feb 2022 13:47:02 +0100 -Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase - -This testcase seems to be flaky, and upstream marked it as such: -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 - -This patch removes the testcase to avoid it interfering with out ptest. - -Signed-off-by: Claudius Heine - -Upstream-Status: Inappropriate [needs proper upstream fix] ---- - tests/check/gst/gstbin.c | 69 ------------------- - 1 file changed, 69 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index e366d5fe20..ac29d81474 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children) - - GST_END_TEST; - --GST_START_TEST (test_watch_for_state_change) --{ -- GstElement *src, *sink, *bin; -- GstBus *bus; -- GstStateChangeReturn ret; -- -- bin = gst_element_factory_make ("bin", NULL); -- fail_unless (bin != NULL, "Could not create bin"); -- -- bus = g_object_new (gst_bus_get_type (), NULL); -- gst_object_ref_sink (bus); -- gst_element_set_bus (GST_ELEMENT_CAST (bin), bus); -- -- src = gst_element_factory_make ("fakesrc", NULL); -- fail_if (src == NULL, "Could not create fakesrc"); -- sink = gst_element_factory_make ("fakesink", NULL); -- fail_if (sink == NULL, "Could not create fakesink"); -- -- gst_bin_add (GST_BIN (bin), sink); -- gst_bin_add (GST_BIN (bin), src); -- -- fail_unless (gst_element_link (src, sink), "could not link src and sink"); -- -- /* change state, spawning two times three messages */ -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); -- fail_unless (ret == GST_STATE_CHANGE_ASYNC); -- ret = -- gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, -- GST_CLOCK_TIME_NONE); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- pop_state_changed (bus, 6); -- pop_async_done (bus); -- pop_latency (bus); -- -- fail_unless (gst_bus_have_pending (bus) == FALSE, -- "Unexpected messages on bus"); -- -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- pop_state_changed (bus, 3); -- -- /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); -- gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); -- -- pop_state_changed (bus, 3); -- if (ret == GST_STATE_CHANGE_ASYNC) { -- pop_async_done (bus); -- pop_latency (bus); -- } -- -- fail_unless (gst_bus_have_pending (bus) == FALSE, -- "Unexpected messages on bus"); -- -- gst_bus_set_flushing (bus, TRUE); -- -- ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); -- fail_unless (ret == GST_STATE_CHANGE_SUCCESS); -- -- /* clean up */ -- gst_object_unref (bus); -- gst_object_unref (bin); --} -- --GST_END_TEST; -- - GST_START_TEST (test_state_change_error_message) - { - GstElement *src, *sink, *bin; -@@ -1956,7 +1888,6 @@ gst_bin_suite (void) - tcase_add_test (tc_chain, test_message_state_changed); - tcase_add_test (tc_chain, test_message_state_changed_child); - tcase_add_test (tc_chain, test_message_state_changed_children); -- tcase_add_test (tc_chain, test_watch_for_state_change); - tcase_add_test (tc_chain, test_state_change_error_message); - tcase_add_test (tc_chain, test_add_linked); - tcase_add_test (tc_chain, test_add_self); --- -2.33.1 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb similarity index 96% rename from recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb index ce7b3f1d4..33b3c65c1 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb @@ -26,8 +26,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://run-ptest \ file://0001-tests-respect-the-idententaion-used-in-meson.patch \ file://0002-tests-add-support-for-install-the-tests.patch \ - file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ - file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ + file://0003-tests-use-a-dictionaries-for-environment.patch \ + file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ " SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61" @@ -95,8 +95,8 @@ LIC_FILES_CHKSUM = " \ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "1a43c16272a7f4274eb8260e03206a57f317d823" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch deleted file mode 100644 index bdcb3f48e..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 090fb758a63b7d362d9bee8b8a665d1346c83f83 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Mar 2023 20:15:22 -0700 -Subject: [PATCH 01/10] aiurdemux: Fix type of USER_DATA_LOCATION - -It should be char pointer not integer -Fixe -plugins/aiurdemux/aiurdemux.c:198:47: error: incompatible integer to pointer conversion initializin -g 'const gchar *' (aka 'const char *') with an expression of type 'int' [-Wint-conversion] - {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1, - ^~ -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - plugins/aiurdemux/aiurdemux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/aiurdemux/aiurdemux.c b/plugins/aiurdemux/aiurdemux.c -index 532b439..39c50ea 100755 ---- a/plugins/aiurdemux/aiurdemux.c -+++ b/plugins/aiurdemux/aiurdemux.c -@@ -195,7 +195,7 @@ static AiurDemuxTagEntry g_user_data_entry[] = { - "Track Number : %s\n"}, - {USER_DATA_TOTALTRACKNUMBER, USER_DATA_FORMAT_UTF8, GST_TAG_TRACK_COUNT, - "Track Count : %s\n"}, -- {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1, -+ {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, (const gchar*)-1, - "Location : %s\n"}, - {USER_DATA_KEYWORDS, USER_DATA_FORMAT_UTF8, GST_TAG_KEYWORDS, - "Keywords : %s\n"}, --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch deleted file mode 100644 index d3fdf924b..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f8b8322cd4c3a69e5cb47b5cb33abe860e89d6ed Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 20:33:54 -0700 -Subject: [PATCH 02/10] aiurdemux.h: Include glib/gprintf.h for g_printf - prototype - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - plugins/aiurdemux/aiurdemux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/aiurdemux/aiurdemux.h b/plugins/aiurdemux/aiurdemux.h -index 1d7d0a0..f7fcb2e 100755 ---- a/plugins/aiurdemux/aiurdemux.h -+++ b/plugins/aiurdemux/aiurdemux.h -@@ -39,7 +39,7 @@ - #include - #include - #include -- -+#include - //#include "mfw_gst_utils.h" - - #include "fsl_parser.h" --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch deleted file mode 100644 index a690b4975..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 19e6a541d2026386c9cfdeca0eebd269fef2536c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Mar 2023 20:29:01 -0700 -Subject: [PATCH 03/10] grecorder: Fix build with clang - -Add missing includes for APIs from libc and glib -Add prototype declaration for post_message before -using it in macros later in the same source file - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - tools/grecorder/grecorder.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c -index c8eff2f..89aa801 100644 ---- a/tools/grecorder/grecorder.c -+++ b/tools/grecorder/grecorder.c -@@ -23,10 +23,11 @@ - #include - #include - #include -+#include /* sleep */ - #include - #define __USE_LARGEFILE64 - #include -- -+#include /* g_print */ - #include "recorder_engine.h" - - #define LOG_ERROR printf -@@ -168,6 +169,8 @@ static RecorderMessage latest_message = MESSAGE_NULL; - - static volatile sig_atomic_t quit_flag = 0; - -+static void post_message (RecorderMessage message); -+ - static void signal_handler(int signum) - { - quit_flag = 1; --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch deleted file mode 100644 index 292ab63f5..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 141f8f692ae2c7e6d41a2d78113c806602122ad5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 19:51:27 -0700 -Subject: [PATCH 04/10] gstimxcommon: Return 0 instead of NULL for a functions - returning unsigned long - -Fixes -gstimxcommon.c:113:10: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion] - return NULL; - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - libs/gstimxcommon.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c -index 27fd913..803c6e5 100644 ---- a/libs/gstimxcommon.c -+++ b/libs/gstimxcommon.c -@@ -35,13 +35,13 @@ unsigned long phy_addr_from_fd(int dmafd) - int ret, fd; - - if (dmafd < 0) -- return NULL; -+ return 0; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) - #ifdef USE_ION - fd = open(dev_ion, O_RDWR); - if(fd < 0) { -- return NULL; -+ return 0; - } - - struct ion_phys_dma_data data = { -@@ -58,18 +58,18 @@ unsigned long phy_addr_from_fd(int dmafd) - ret = ioctl(fd, ION_IOC_CUSTOM, &custom); - close(fd); - if (ret < 0) -- return NULL; -+ return 0; - - return data.phys; - #else -- return NULL; -+ return 0; - #endif /* USE_ION */ - #else - struct dma_buf_phys dma_phys; - - ret = ioctl(dmafd, DMA_BUF_IOCTL_PHYS, &dma_phys); - if (ret < 0) -- return NULL; -+ return 0; - - return dma_phys.phys; - #endif -@@ -86,7 +86,7 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size) - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) - fd = open(dev_ion, O_RDWR); - if(fd < 0) { -- return NULL; -+ return 0; - } - - struct ion_phys_virt_data data = { -@@ -103,13 +103,13 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size) - ret = ioctl(fd, ION_IOC_CUSTOM, &custom); - close(fd); - if (ret < 0) -- return NULL; -+ return 0; - - return data.phys; - #else -- return NULL; -+ return 0; - #endif - #else -- return NULL; -+ return 0; - #endif - } --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch deleted file mode 100644 index 5f67ba1b0..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 379b0492a4b53fd8fd42c734d04fd62df2e0465f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Mar 2023 20:16:48 -0700 -Subject: [PATCH 05/10] aiurstreamcache: Include gst/gstinfo.h - -Its needed for various GST_* defines - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - plugins/aiurdemux/aiurstreamcache.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/aiurdemux/aiurstreamcache.c b/plugins/aiurdemux/aiurstreamcache.c -index d566268..e114a9d 100755 ---- a/plugins/aiurdemux/aiurstreamcache.c -+++ b/plugins/aiurdemux/aiurstreamcache.c -@@ -33,6 +33,7 @@ - * Changelog: - * - */ -+ #include - - GST_DEBUG_CATEGORY_EXTERN (aiurdemux_debug); - #define GST_CAT_DEFAULT aiurdemux_debug --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch deleted file mode 100644 index ae3d10618..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 02e16c4de3f138f0ebabf699e840bb86c98be599 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 20:45:23 -0700 -Subject: [PATCH 06/10] Fix typecast warnings found with clang - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - libs/device-2d/imx_2d_device_g2d.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c -index 2672e0b..6a36f6a 100755 ---- a/libs/device-2d/imx_2d_device_g2d.c -+++ b/libs/device-2d/imx_2d_device_g2d.c -@@ -425,7 +425,7 @@ static gint imx_g2d_blit(Imx2DDevice *device, - goto err; - } - if (paddr) { -- src->mem->paddr = paddr; -+ src->mem->paddr = (guint8*)paddr; - } else { - GST_ERROR ("Can't get physical address."); - ret = -1; -@@ -435,7 +435,7 @@ static gint imx_g2d_blit(Imx2DDevice *device, - if (!dst->mem->paddr) { - paddr = phy_addr_from_fd (dst->fd[0]); - if (paddr) { -- dst->mem->paddr = paddr; -+ dst->mem->paddr = (guint8*)paddr; - } else { - GST_ERROR ("Can't get physical address."); - ret = -1; -@@ -474,10 +474,11 @@ static gint imx_g2d_blit(Imx2DDevice *device, - - if (src->fd[1] >= 0) - { -- if (!src->mem->user_data) -- src->mem->user_data = g2d->src.base.planes[1] = phy_addr_from_fd (src->fd[1]); -- else -- g2d->src.base.planes[1] = src->mem->user_data; -+ if (!src->mem->user_data) { -+ g2d->src.base.planes[1] = (gint)phy_addr_from_fd (src->fd[1]); -+ src->mem->user_data = (gpointer *)g2d->src.base.planes[1]; -+ } else -+ g2d->src.base.planes[1] = (unsigned long)src->mem->user_data; - } - switch (src->interlace_type) { - case IMX_2D_INTERLACE_INTERLEAVED: -@@ -693,7 +694,7 @@ static gint imx_g2d_fill_color(Imx2DDevice *device, Imx2DFrame *dst, - if (!dst->mem->paddr) { - paddr = phy_addr_from_fd (dst->fd[0]); - if (paddr) { -- dst->mem->paddr = paddr; -+ dst->mem->paddr = (guint8*)paddr; - } else { - GST_ERROR ("Can't get physical address."); - return -1; --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch deleted file mode 100644 index 1983838af..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a1a2069403e227d4d40fc99257d1be077f65bdc8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 19:54:18 -0700 -Subject: [PATCH 07/10] gstimxv4l2: Fix typecasting errors - -Fixes -gstimxv4l2.c:1702:22: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-conversion] - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - libs/v4l2_core/gstimxv4l2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c -index 1dc826b..bf2620a 100755 ---- a/libs/v4l2_core/gstimxv4l2.c -+++ b/libs/v4l2_core/gstimxv4l2.c -@@ -1699,7 +1699,7 @@ gint gst_imx_v4l2_register_buffer (gpointer v4l2handle, PhyMemBlock *memblk) - v4l2buf->type = handle->type; - v4l2buf->memory = handle->memory_mode; - v4l2buf->index = handle->allocated; -- v4l2buf->m.userptr = memblk->paddr; -+ v4l2buf->m.userptr = (unsigned long)memblk->paddr; - v4l2buf->length = memblk->size; - handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr; - --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch deleted file mode 100644 index 211bade10..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e86c20fee52f79a270a1913c5f0be98fb3f5cb77 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Mar 2023 20:18:18 -0700 -Subject: [PATCH 08/10] beepdec: Declare beep_register_external_typefinders - -Fixes -plugins/beepdec/beep.c:45:3: error: call to undeclared function 'beep_register_external_typefinders'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - beep_register_external_typefinders (plugin); - ^ - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - plugins/beepdec/beep.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/beepdec/beep.c b/plugins/beepdec/beep.c -index 3543352..e174bb3 100755 ---- a/plugins/beepdec/beep.c -+++ b/plugins/beepdec/beep.c -@@ -37,7 +37,7 @@ - #endif - #include "beepdec.h" - #include "gstimxcommon.h" -- -+extern gboolean beep_register_external_typefinders (GstPlugin * plugin); - static gboolean - plugin_init (GstPlugin * plugin) - { --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch deleted file mode 100644 index 567d10267..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8a3d7f26c73bdfe050d3331b30ae2f5917dc6723 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 19:59:22 -0700 -Subject: [PATCH 09/10] gstimxv4l2.c: Fix incompatible integer to pointer - conversion returning - -Fixes -gstimxv4l2.c:1587:24: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-c -onversion] - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - libs/v4l2_core/gstimxv4l2.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c -index bf2620a..0fd7452 100755 ---- a/libs/v4l2_core/gstimxv4l2.c -+++ b/libs/v4l2_core/gstimxv4l2.c -@@ -1576,7 +1576,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk) - - if (handle->allocated >= MAX_BUFFER) { - GST_ERROR ("No more v4l2 buffer for allocating.\n"); -- return -1; -+ return NULL; - } - - v4l2buf = &handle->buffer_pair[handle->allocated].v4l2buffer; -@@ -1584,7 +1584,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk) - v4l2buf->type = handle->type; - v4l2buf->memory = handle->memory_mode; - v4l2buf->index = handle->allocated; -- v4l2buf->m.userptr = memblk->paddr; -+ v4l2buf->m.userptr = (unsigned long)memblk->paddr; - v4l2buf->length = memblk->size; - handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr; - --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch deleted file mode 100644 index e9b1a0938..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2144da90e64547d9e346f8e721a0d2155ed610b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Mar 2023 21:09:49 -0700 -Subject: [PATCH 10/10] provide declaration for - aiur_register_external_typefinders - -Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] -Signed-off-by: Khem Raj ---- - plugins/aiurdemux/aiur.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/aiurdemux/aiur.c b/plugins/aiurdemux/aiur.c -index 2a52465..681ae2e 100755 ---- a/plugins/aiurdemux/aiur.c -+++ b/plugins/aiurdemux/aiur.c -@@ -41,6 +41,8 @@ - #include "aiurdemux.h" - #include "gstimxcommon.h" - -+extern gboolean aiur_register_external_typefinders (GstPlugin * plugin); -+ - static gboolean - plugin_init (GstPlugin * plugin) - { --- -2.39.2 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index a13cf30ab..12d8de22a 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb @@ -34,23 +34,13 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin" RPROVIDES:${PN} = "gst1.0-fsl-plugin" RCONFLICTS:${PN} = "gst1.0-fsl-plugin" -PV = "4.8.3+git${SRCPV}" +PV = "4.9.0+git${SRCPV}" SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \ - file://0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch \ - file://0003-grecorder-Fix-build-with-clang.patch \ - file://0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch \ - file://0005-aiurstreamcache-Include-gst-gstinfo.h.patch \ - file://0006-Fix-typecast-warnings-found-with-clang.patch \ - file://0007-gstimxv4l2-Fix-typecasting-errors.patch \ - file://0008-beepdec-Declare-beep_register_external_typefinders.patch \ - file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \ - file://0010-provide-declaration-for-aiur_register_external_typef.patch \ file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \ " -SRCBRANCH = "MM_04.08.03_2312_L6.6.y" -SRCREV = "91c7fec888cf8932c91e354331aad94975cae3ff" +SRCBRANCH = "MM_04.09.00_2405_L6.6.y" +SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96" S = "${WORKDIR}/git" From 86cd9b312e4515dfb5dd8e7213b8c7a39cce68af Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Wed, 31 Jul 2024 16:07:56 -0300 Subject: [PATCH 12/30] imx-opencl-converter: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update imx-opencl-converter to version 0.4.0, syncing with meta-imx layer and the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit 0f663b89eaff6e2f8cbeb44966725b6e58633de3) --- ...001-src-ocl.c-fix-wrong-integer-type.patch | 39 ------------------- .../imx-opencl-converter_0.2.0.bb | 21 ---------- .../imx-opencl-converter_0.4.0.bb | 21 ++++++++++ 3 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 recipes-multimedia/imx-opencl-converter/imx-opencl-converter/0001-src-ocl.c-fix-wrong-integer-type.patch delete mode 100644 recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb create mode 100644 recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter/0001-src-ocl.c-fix-wrong-integer-type.patch b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter/0001-src-ocl.c-fix-wrong-integer-type.patch deleted file mode 100644 index d84a6a639..000000000 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter/0001-src-ocl.c-fix-wrong-integer-type.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e78af6d0c9cd1a655f6bc17173f6c411b8b34d2f Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sat, 1 Jun 2024 11:07:13 +0000 -Subject: [PATCH] src/ocl.c: fix wrong integer type - -Fixes: -| .../ocl.c:258:22: error: passing argument 6 of 'clGetProgramBuildInfo' from incompatible pointer type [-Wincompatible-pointer-types] - 258 | 0, NULL, &log_size); - | ^~~~~~~~~ - | | - | int * -In file included from .../recipe-sysroot/usr/include/CL/cl_ext.h:27, - from .../ocl.c:21: -/recipe-sysroot/usr/include/CL/cl.h:1348:45: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'int *' - 1348 | size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; - | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Max Krummenacher ---- - src/ocl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ocl.c b/src/ocl.c -index f56d9cb..b2b0c52 100644 ---- a/src/ocl.c -+++ b/src/ocl.c -@@ -253,7 +253,7 @@ static OCL_RESULT CreateProgram(ImxOcl* ocl, const char* binName, const char* sr - cl_ret = clBuildProgram (program, 1, &ocl->device, "", NULL, NULL); - if (cl_ret < 0) - { -- int log_size; -+ size_t log_size; - cl_ret = clGetProgramBuildInfo(program, ocl->device, CL_PROGRAM_BUILD_LOG, - 0, NULL, &log_size); - --- -2.42.0 - diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb deleted file mode 100644 index f3e33e0d2..000000000 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2023 NXP -DESCRIPTION = "NXP Multimedia opencl converter lib" -LICENSE = "Proprietary" -SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" -DEPENDS = "opencl-headers" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://0001-src-ocl.c-fix-wrong-integer-type.patch \ -" -SRC_URI[md5sum] = "dc668682189ce740fb46073e62f58066" -SRC_URI[sha256sum] = "9f283df500c57421b87d96d9af7022ab490bc241aa28d00755beaadabbcd754b" - -inherit fsl-eula-unpack autotools pkgconfig meson - -FILES:${PN} += "${datadir}/" - -COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE:imxgpu = "(mx8-nxp-bsp|mx95-nxp-bsp)" -COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)" diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb new file mode 100644 index 000000000..86bab3fce --- /dev/null +++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.4.0.bb @@ -0,0 +1,21 @@ +# Copyright 2023 NXP +DESCRIPTION = "NXP Multimedia opencl converter lib" +LICENSE = "Proprietary" +SECTION = "multimedia" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +DEPENDS = "virtual/opencl-icd" + +SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" +IMX_SRCREV_ABBREV = "efe25d6" + +SRC_URI[md5sum] = "daa99b8615ca08280833bb80bc52c9be" +SRC_URI[sha256sum] = "1717f7fe64b260156b8d5b353add5edb7bc0217dd3847ac641601d4a59494f08" + +S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" +inherit fsl-eula-unpack autotools pkgconfig meson + +FILES:${PN} += "${datadir}/" + +COMPATIBLE_MACHINE = "(^$)" +COMPATIBLE_MACHINE:imxgpu = "(mx8-nxp-bsp|mx95-nxp-bsp)" +COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)" From dcf5ab3d5f81b62ee15bf71b1d42f0023db5d1a8 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 5 Aug 2024 11:31:23 +0200 Subject: [PATCH 13/30] openembedded-layer: Remove luajit abbappend This (qoriq-ppc only) patch fails to apply since upstream commit https://repo.or.cz/luajit-2.0.git/commitdiff/338e9863c220462201fde0e725aba4002310c849 This breaks 'devtool modify luajit' even on non-qoriq-pcc platforms. Signed-off-by: Alexander Stein (cherry picked from commit 753a955102667f147c97823ec881f5c028dca137) --- .../luajit/luajit/ppc-fixplt.patch | 104 ------------------ .../recipes-devtools/luajit/luajit_%.bbappend | 4 - 2 files changed, 108 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch deleted file mode 100644 index a576f917a..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit/ppc-fixplt.patch +++ /dev/null @@ -1,104 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Khem Raj - -libluajit is having symbols that can't be -resolved the reloc cannot accommodate an offset greater than 24 bits. - -Looking at libluajit with readelf -r, you see a bunch of entries that look like: - 000082f0 00003c0a R_PPC_REL24 00000000 sqrt + 0 - -These should not occur when the code is compiled and linked with -fPIC. - -It turns out that libluajit *is* compiled and linked with -fPIC, however... -There is one assembler file called lj_vm.s which is generated during the build. -This file is missing the `@plt' qualifier from external references. - -This file is generated by a program called buildvm. This in turn uses tables -in a file called buildvm_arch.h which is generated by dynasm.lua. - -Index: LuaJIT-2.0.1/src/host/buildvm.c -=================================================================== ---- LuaJIT-2.0.1.orig/src/host/buildvm.c 2013-02-19 12:15:00.000000000 -0800 -+++ LuaJIT-2.0.1/src/host/buildvm.c 2013-05-14 20:26:05.933444512 -0700 -@@ -107,12 +107,14 @@ - #endif - sprintf(name, "%s%s%s", symprefix, prefix, suffix); - p = strchr(name, '@'); -+#if 0 - if (p) { - if (!LJ_64 && (ctx->mode == BUILD_coffasm || ctx->mode == BUILD_peobj)) - name[0] = '@'; - else - *p = '\0'; - } -+#endif - p = (char *)malloc(strlen(name)+1); /* MSVC doesn't like strdup. */ - strcpy(p, name); - return p; -Index: LuaJIT-2.0.1/src/vm_ppcspe.dasc -=================================================================== ---- LuaJIT-2.0.1.orig/src/vm_ppcspe.dasc 2013-02-19 12:15:00.000000000 -0800 -+++ LuaJIT-2.0.1/src/vm_ppcspe.dasc 2013-05-14 20:26:05.937444512 -0700 -@@ -1390,7 +1390,7 @@ - | checknum CARG2 - | evmergehi CARG1, CARG2, CARG2 - | checkfail ->fff_fallback -- | bl extern func -+ | bl extern func@plt - | evmergelo CRET1, CRET1, CRET2 - | b ->fff_restv - |.endmacro -@@ -1405,7 +1405,7 @@ - | checknum CARG1 - | evmergehi CARG3, CARG4, CARG4 - | checkanyfail ->fff_fallback -- | bl extern func -+ | bl extern func@plt - | evmergelo CRET1, CRET1, CRET2 - | b ->fff_restv - |.endmacro -@@ -1437,7 +1437,7 @@ - | checknum CARG2 - | evmergehi CARG1, CARG2, CARG2 - | checkfail ->fff_fallback -- | bl extern log -+ | bl extern log@plt - | evmergelo CRET1, CRET1, CRET2 - | b ->fff_restv - | -@@ -1471,7 +1471,7 @@ - | checknum CARG1 - | checkanyfail ->fff_fallback - | efdctsi CARG3, CARG4 -- | bl extern ldexp -+ | bl extern ldexp@plt - | evmergelo CRET1, CRET1, CRET2 - | b ->fff_restv - | -@@ -1484,7 +1484,7 @@ - | checkfail ->fff_fallback - | la CARG3, DISPATCH_GL(tmptv)(DISPATCH) - | lwz PC, FRAME_PC(BASE) -- | bl extern frexp -+ | bl extern frexp@plt - | lwz TMP1, DISPATCH_GL(tmptv)(DISPATCH) - | evmergelo CRET1, CRET1, CRET2 - | efdcfsi CRET2, TMP1 -@@ -1503,7 +1503,7 @@ - | checkfail ->fff_fallback - | la CARG3, -8(BASE) - | lwz PC, FRAME_PC(BASE) -- | bl extern modf -+ | bl extern modf@plt - | evmergelo CRET1, CRET1, CRET2 - | la RA, -8(BASE) - | evstdd CRET1, 0(BASE) -@@ -2399,7 +2399,7 @@ - | checknum CARG1 - | evmergehi CARG3, CARG4, CARG4 - | checkanyfail ->vmeta_arith_vv -- | bl extern pow -+ | bl extern pow@plt - | evmergelo CRET2, CRET1, CRET2 - | evstddx CRET2, BASE, RA - | ins_next diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend deleted file mode 100644 index d07f8ae14..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch " - From 3a7c137a3608e93bfd791986ff5df4d2699ea564 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 26 Jul 2024 18:14:51 +0300 Subject: [PATCH 14/30] imx-dpu-g2d: Upgrade imxdpu-g2d from 2.1.12 to 2.1.14 imx-gpu-g2d: Upgrade from 6.4.11.p2.4 to 6.4.11.p2.6 imx-g2d-samples: Update to latest 431f311a imx-pxp-g2d: Update to latest edd234c4e Signed-off-by: Valentin Jec (cherry picked from commit 74fd3be7c0d23cdf0fe227a50b18f3d506f06ce6) --- ...dpu-g2d_2.1.12.bb => imx-dpu-g2d_2.1.14.bb} | 18 +++++++++++------- .../imx-g2d/imx-g2d-samples_git.bb | 2 +- ...4.11.p2.4.bb => imx-gpu-g2d_6.4.11.p2.6.bb} | 12 ++++++------ recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | 5 +++-- 4 files changed, 21 insertions(+), 16 deletions(-) rename recipes-graphics/imx-g2d/{imx-dpu-g2d_2.1.12.bb => imx-dpu-g2d_2.1.14.bb} (64%) rename recipes-graphics/imx-g2d/{imx-gpu-g2d_6.4.11.p2.4.bb => imx-gpu-g2d_6.4.11.p2.6.bb} (74%) diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb similarity index 64% rename from recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb rename to recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb index b10cd997a..23168ae16 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb @@ -4,7 +4,7 @@ DESCRIPTION = "G2D library using i.MX DPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" DEPENDS = "libdrm ${LIBGAL_IMX}" LIBGAL_IMX = "libgal-imx" @@ -15,15 +15,15 @@ PROVIDES += "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "ee47ef7" +IMX_SRCREV_ABBREV = "6a00326" IMX_SRC_URI_NAME = "v1" -SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526" -SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0" +SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c" +SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940" -IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7" +IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326" IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" -SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d" -SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b" +SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09" +SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee" S = "${WORKDIR}/${IMX_BIN_NAME}" @@ -36,10 +36,14 @@ do_install () { cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} } +INSANE_SKIP:append:libc-musl = " file-rdeps" +RDEPENDS:${PN}:append:libc-musl = " gcompat" + # The packaged binaries have been stripped of debug info, so disable # operations accordingly. INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" +PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 55f88da39..0f0c18967 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -10,7 +10,7 @@ PV = "2.1+git${SRCPV}" SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" SRCBRANCH = "imx_2.1" -SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f" +SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d" S = "${WORKDIR}/git" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb similarity index 74% rename from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb rename to recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb index 3ebb8f884..d12d9c1a8 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb @@ -5,17 +5,17 @@ DESCRIPTION = "G2D library using i.MX GPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" DEPENDS = "libgal-imx" PROVIDES = "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "b07999b" -SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee" -SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7" -SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4" -SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c" +IMX_SRCREV_ABBREV = "bc7b6a2" +SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f" +SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918" +SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2" +SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663" S = "${WORKDIR}/${IMX_BIN_NAME}" diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index 50c37a2c5..4481188b1 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "G2D library using i.MX PXP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a" PROVIDES += "virtual/libg2d" @@ -13,7 +13,7 @@ PV = "2.1.0+git${SRCPV}" SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" SRCBRANCH = "imx_2.1" -SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586" +SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07" S = "${WORKDIR}/git" @@ -25,4 +25,5 @@ do_install() { oe_runmake install } +PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" From 26cd1fdd512ad8b95b67bbe46444098eacae5799 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 26 Jul 2024 18:16:56 +0300 Subject: [PATCH 15/30] imx-gpu-viv: Upgrade from 6.4.11.p2.4-* to 6.4.11.p2.6-* Signed-off-by: Valentin Jec (cherry picked from commit 46949846a64108f4fec63b33c4d64cfe7415009a) --- .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb | 10 ---------- .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb | 10 ---------- .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb | 10 ++++++++++ .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb | 10 ++++++++++ 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb deleted file mode 100644 index 2b1724664..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb +++ /dev/null @@ -1,10 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" - -IMX_SRCREV_ABBREV = "b07999b" - -SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0" -SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474" - -COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb deleted file mode 100644 index b3c397362..000000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb +++ /dev/null @@ -1,10 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" - -IMX_SRCREV_ABBREV = "b07999b" - -SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5" -SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb new file mode 100644 index 000000000..db99b1c71 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +IMX_SRCREV_ABBREV = "bc7b6a2" + +SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690" +SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3" + +COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb new file mode 100644 index 000000000..fb73322ae --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb @@ -0,0 +1,10 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +IMX_SRCREV_ABBREV = "bc7b6a2" + +SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f" +SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" From ca7fa4bc8d69580f7ede825f3d46c7f41173d11b Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 26 Jul 2024 18:25:22 +0300 Subject: [PATCH 16/30] mesa-demos: Add patch for egl clear backgrounds black color mesa: Add patches for video showing wrong frame and fix virgl driver assert issue Signed-off-by: Valentin Jec (cherry picked from commit 6204783c642c92e3d59d0cbea494df59d5958cd7) --- .../0001-egl-clear-backgrounds-black.patch | 30 ++++++++++++ recipes-graphics/mesa/mesa-demos_%.bbappend | 3 +- ...99-cso-fix-virgl-driver-assert-issue.patch | 47 +++++++++++++++++++ ...l-dri2-fix-video-showing-wrong-frame.patch | 33 +++++++++++++ recipes-graphics/mesa/mesa_%.bbappend | 3 ++ 5 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch create mode 100644 recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch create mode 100644 recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch diff --git a/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch new file mode 100644 index 000000000..fa46823f1 --- /dev/null +++ b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch @@ -0,0 +1,30 @@ +From cad7eb0f0487aea64c4460bd6ad95b5c9537d35a Mon Sep 17 00:00:00 2001 +From: Jiyu Yang +Date: Thu, 11 Apr 2024 16:30:50 +0800 +Subject: [PATCH] egl: clear backgrounds black + +if 50% translucency used, the application render result can vary +depending on the format chosen, such as R10G10B10A2 or RGB24. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/174] +Signed-off-by: Jiyu Yang +--- + src/egl/opengles2/es2gears.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/egl/opengles2/es2gears.c b/src/egl/opengles2/es2gears.c +index db67f3a9..4e81afe7 100644 +--- a/src/egl/opengles2/es2gears.c ++++ b/src/egl/opengles2/es2gears.c +@@ -515,7 +515,7 @@ gears_draw(void) + GLfloat transform[16]; + identity(transform); + +- glClearColor(0.0, 0.0, 0.0, 0.0); ++ glClearColor(0.0, 0.0, 0.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + /* Translate and rotate the view */ +-- +2.34.1 + diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index ff5d71ae1..1c5dd3daf 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -2,7 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:imxgpu = " \ file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ - file://fix-clear-build-break.patch" + file://fix-clear-build-break.patch \ + file://0001-egl-clear-backgrounds-black.patch" REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11" diff --git a/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch b/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch new file mode 100644 index 000000000..3dc8db099 --- /dev/null +++ b/recipes-graphics/mesa/mesa/0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch @@ -0,0 +1,47 @@ +From 612c3dc98d5d050b9cfee16ec77ca3c8358caa0d Mon Sep 17 00:00:00 2001 +From: Wujian Sun +Date: Mon, 29 Apr 2024 17:29:16 +0800 +Subject: [PATCH] MGS-7599 cso: fix virgl driver assert issue + +A workaround that remove PIPE_MAX_SAMPLERS and +PIPE_MAX_CONSTANT_BUFFERS assert. + +Upstream-Status: Inappropriate [i.MX-specific] + +Signed-off-by: Wujian Sun +--- + src/gallium/auxiliary/cso_cache/cso_context.c | 2 -- + src/gallium/drivers/virgl/virgl_screen.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c +index 3e86def31c5..ffc6d22da9c 100644 +--- a/src/gallium/auxiliary/cso_cache/cso_context.c ++++ b/src/gallium/auxiliary/cso_cache/cso_context.c +@@ -403,10 +403,8 @@ cso_unbind_context(struct cso_context *ctx) + PIPE_SHADER_CAP_MAX_CONST_BUFFERS); + int maximg = scr->get_shader_param(scr, sh, + PIPE_SHADER_CAP_MAX_SHADER_IMAGES); +- assert(maxsam <= PIPE_MAX_SAMPLERS); + assert(maxview <= PIPE_MAX_SHADER_SAMPLER_VIEWS); + assert(maxssbo <= PIPE_MAX_SHADER_BUFFERS); +- assert(maxcb <= PIPE_MAX_CONSTANT_BUFFERS); + assert(maximg <= PIPE_MAX_SHADER_IMAGES); + if (maxsam > 0) { + ctx->base.pipe->bind_sampler_states(ctx->base.pipe, sh, 0, maxsam, zeros); +diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c +index 389a1935cc3..7c7f8ba576b 100644 +--- a/src/gallium/drivers/virgl/virgl_screen.c ++++ b/src/gallium/drivers/virgl/virgl_screen.c +@@ -435,7 +435,7 @@ virgl_get_shader_param(struct pipe_screen *screen, + return 1; + case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: + return MIN2(vscreen->caps.caps.v2.max_shader_sampler_views, +- PIPE_MAX_SHADER_SAMPLER_VIEWS); ++ PIPE_MAX_SAMPLERS); + case PIPE_SHADER_CAP_INTEGERS: + return vscreen->caps.caps.v1.glsl_level >= 130; + case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH: +-- +2.17.1 + diff --git a/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch b/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch new file mode 100644 index 000000000..0cdcbfca6 --- /dev/null +++ b/recipes-graphics/mesa/mesa/0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch @@ -0,0 +1,33 @@ +From 188d7b01037e5a0249e63c2600cf15a288a9ff3f Mon Sep 17 00:00:00 2001 +From: Wujian Sun +Date: Fri, 19 Apr 2024 18:38:17 +0800 +Subject: [PATCH] MGS-7673 egl/dri2: fix video showing wrong frame + +Softpipe driver doesn't support EGL_EXT_image_dma_buf_import_modifiers +extension. +Should not report the extension. + +Upstream-Status: Pending + +Signed-off-by: Wujian Sun +--- + src/egl/drivers/dri2/egl_dri2.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c +index 992f0e3d46d..6ee209d4b47 100644 +--- a/src/egl/drivers/dri2/egl_dri2.c ++++ b/src/egl/drivers/dri2/egl_dri2.c +@@ -942,7 +942,8 @@ dri2_setup_screen(_EGLDisplay *disp) + + #ifdef HAVE_LIBDRM + if (dri2_dpy->image->base.version >= 8 && +- dri2_dpy->image->createImageFromDmaBufs) { ++ dri2_dpy->image->createImageFromDmaBufs && ++ strcmp("softpipe", pscreen->get_name(pscreen))) { + disp->Extensions.EXT_image_dma_buf_import = EGL_TRUE; + disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_TRUE; + } +-- +2.17.1 + diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index acddfbc66..f2375a55c 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,6 +1,9 @@ PROVIDES:remove:imxgpu = "virtual/egl" PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2" +SRC_URI:append:mx93-nxp-bsp = " file://0001-MGS-7673-egl-dri2-fix-video-showing-wrong-frame.patch" +SRC_URI:append:imx-nxp-bsp = " file://0001-MGS-7599-cso-fix-virgl-driver-assert-issue.patch" + PACKAGECONFIG:remove:imxgpu = "egl gbm" PACKAGECONFIG:remove:imxgpu3d = "gles" From d3b0de77665a0e568238d6a39b7d3efc8154ef85 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Mon, 29 Jul 2024 10:04:07 +0300 Subject: [PATCH 17/30] weston: Upgrade from 12.0.3.imx to 12.0.4.imx Signed-off-by: Valentin Jec (cherry picked from commit 4297c9d7b0799b48527efa990b8b5e8b35e41596) --- .../wayland/{weston_12.0.3.imx.bb => weston_12.0.4.imx.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename recipes-graphics/wayland/{weston_12.0.3.imx.bb => weston_12.0.4.imx.bb} (97%) diff --git a/recipes-graphics/wayland/weston_12.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb similarity index 97% rename from recipes-graphics/wayland/weston_12.0.3.imx.bb rename to recipes-graphics/wayland/weston_12.0.4.imx.bb index 8114ddbbf..d543900d2 100644 --- a/recipes-graphics/wayland/weston_12.0.3.imx.bb +++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb @@ -167,10 +167,11 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70" DEFAULT_PREFERENCE = "-1" SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" -SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " +SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} " +WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" -SRCBRANCH = "weston-imx-12.0.3" -SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f" +SRCBRANCH = "weston-imx-12.0.4" +SRCREV = "461c49d20677cfd36d01a95dafbd9eedf2a4b09c" S = "${WORKDIR}/git" PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" From 19b0b252652eaf51b69bb5bd9f17c81596a64b0f Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Mon, 29 Jul 2024 10:04:27 +0300 Subject: [PATCH 18/30] wayland-protocols: Replace hardcoded SRC_URI with WAYLAND_PROTOCOLS_SRC variable Signed-off-by: Valentin Jec (cherry picked from commit 6338d5bda5b55ae8e2df2a6f30b45b02ebf5f153) --- recipes-graphics/wayland/wayland-protocols_1.32.imx.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb index 6b2a70917..131f227de 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb @@ -9,7 +9,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}" +WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https" +SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" SRCREV = "7ece577d467f8afb2f5a2f7fff3761a1e0ee9dad" S = "${WORKDIR}/git" From 045b3d306b7c97dd259d808fd92ce130c285dec2 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Tue, 13 Aug 2024 12:52:37 -0300 Subject: [PATCH 19/30] libimxvpuapi2: Bump revision to 8639837a246f After bumping gstreamer1.0-plugins-imx build is failing. Here is a snippet of the build error: | ../git/ext/vpu/gstimxvpuenc.c:473:20: error: 'ImxVpuApiEncOpenParams' has no member named 'fixed_intra_quantization' | open_params->fixed_intra_quantization = imx_vpu_enc->fixed_intra_quantization; | ^~ Fix it by updating libimxvpuapi2 to the current HEAD of its repository. Signed-off-by: Hiago De Franco (cherry picked from commit c27889664be1cb62926c19c619838882367136c5) --- recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb index 1e7d8252c..eef96e56e 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb @@ -11,7 +11,7 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" PV .= "+git${SRCPV}" SRCBRANCH ?= "master" -SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09" +SRCREV = "8639837a246f8d85fba8a707c130239aeabc0a19" SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" From aa613b568e32276fbce6b48e20852e411649d94b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 14 Aug 2024 08:57:50 -0700 Subject: [PATCH 20/30] u-boot-imx: Update to lf-6.6.23-2.0.0 Update the u-boot-imx to the tag lf-6.6.23-2.0.0, that is used in the NXP BSP LF6.6.23_2.0.0. Signed-off-by: Tom Hochstein (cherry picked from commit 8335c55ed1f67ad38062dbc7ed35b8ef41466033) --- ...ommon_2023.04.inc => u-boot-imx-common_2024.04.inc} | 6 +++--- .../{u-boot-imx_2023.04.bb => u-boot-imx_2024.04.bb} | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) rename recipes-bsp/u-boot/{u-boot-imx-common_2023.04.inc => u-boot-imx-common_2024.04.inc} (80%) rename recipes-bsp/u-boot/{u-boot-imx_2023.04.bb => u-boot-imx_2024.04.bb} (91%) diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc similarity index 80% rename from recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc rename to recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc index e23235627..5d49a8306 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc @@ -4,9 +4,9 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf_v2023.04" -LOCALVERSION ?= "-imx_v2023.04_6.6.3-1.0.0" -SRCREV = "f8a2983ec83afd43731d905b4ff0ffd57b57f2f0" +SRCBRANCH = "lf_v2024.04" +LOCALVERSION ?= "-imx_v2024.04_6.6.23-2.0.0" +SRCREV = "674440bc73e1dd483b84269cccfad89ab40af424" DEPENDS += " \ bc-native \ diff --git a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb similarity index 91% rename from recipes-bsp/u-boot/u-boot-imx_2023.04.bb rename to recipes-bsp/u-boot/u-boot-imx_2024.04.bb index 0e7c467b9..3d03c8349 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2023.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb @@ -1,6 +1,6 @@ # Copyright (C) 2013-2016 Freescale Semiconductor # Copyright 2018 (C) O.S. Systems Software LTDA. -# Copyright (C) 2017-2023 NXP +# Copyright (C) 2017-2024 NXP require recipes-bsp/u-boot/u-boot.inc require u-boot-imx-common_${PV}.inc @@ -57,6 +57,14 @@ do_deploy:append:mx8m-generic-bsp() { done unset i fi + + # Deploy CRT.* from u-boot for stmm + install -m 0644 ${S}/CRT.* ${DEPLOYDIR} +} + +do_deploy:append:mx93-generic-bsp() { + # Deploy CRT.* from u-boot for stmm + install -m 0644 ${S}/CRT.* ${DEPLOYDIR} } PACKAGE_ARCH = "${MACHINE_ARCH}" From 02063c78037e8708fc017a8f6e831c2e0212f336 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 14 Aug 2024 09:05:32 -0700 Subject: [PATCH 21/30] linux-imx*: Upgrade v6.6.3-1.0.0 -> v6.6.23-2.0.0 Include three backported patches to avoid QA Errors for illegal TMPDIR references. Signed-off-by: Tom Hochstein (cherry picked from commit 81ec8d145bc632e2245467921bd9cfdbc2fc7ff5) --- recipes-kernel/linux/linux-imx-headers_6.6.bb | 6 +- ...gistry-don-t-mention-the-full-path-o.patch | 62 ++++++++++++++++ ...sh-Don-t-mention-the-full-path-of-th.patch | 70 +++++++++++++++++++ ...full-path-of-the-input-filename-in-g.patch | 38 ++++++++++ recipes-kernel/linux/linux-imx_6.6.bb | 14 ++-- 5 files changed, 183 insertions(+), 7 deletions(-) create mode 100644 recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch create mode 100644 recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch create mode 100644 recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.6.bb index 95ec32b04..65634ac91 100644 --- a/recipes-kernel/linux/linux-imx-headers_6.6.bb +++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb @@ -1,4 +1,4 @@ -# Copyright 2017-2023 NXP +# Copyright 2017-2024 NXP # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "Installs i.MX-specific kernel headers" @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCBRANCH = "lf-6.6.y" -LOCALVERSION = "-6.6.3-1.0.0" -SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" +LOCALVERSION = "-6.6.23-2.0.0" +SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387" S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch b/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch new file mode 100644 index 000000000..2933c40e3 --- /dev/null +++ b/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch @@ -0,0 +1,62 @@ +From 5ef6dc08cfde240b8c748733759185646e654570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Wed, 13 Mar 2024 22:19:56 +0100 +Subject: [PATCH] lib/build_OID_registry: don't mention the full path of the + script in output +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change strips the full path of the script generating +lib/oid_registry_data.c to just lib/build_OID_registry. The motivation +for this change is Yocto emitting a build warning + + File /usr/src/debug/linux-lxatac/6.7-r0/lib/oid_registry_data.c in package linux-lxatac-src contains reference to TMPDIR [buildpaths] + +So this change brings us one step closer to make the build result +reproducible independent of the build path. + +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/5ef6dc08cfde240b8c748733759185646e654570] + +Link: https://lkml.kernel.org/r/20240313211957.884561-2-u.kleine-koenig@pengutronix.de +Signed-off-by: Uwe Kleine-König +Cc: Masahiro Yamada +Reviewed-by: Nicolas Schier +Signed-off-by: Andrew Morton +--- + lib/build_OID_registry | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/build_OID_registry b/lib/build_OID_registry +index d7fc32ea8ac2..56d8bafeb848 100755 +--- a/lib/build_OID_registry ++++ b/lib/build_OID_registry +@@ -8,6 +8,7 @@ + # + + use strict; ++use Cwd qw(abs_path); + + my @names = (); + my @oids = (); +@@ -17,6 +18,8 @@ if ($#ARGV != 1) { + exit(2); + } + ++my $abs_srctree = abs_path($ENV{'srctree'}); ++ + # + # Open the file to read from + # +@@ -35,7 +38,7 @@ close IN_FILE || die; + # + open C_FILE, ">$ARGV[1]" or die; + print C_FILE "/*\n"; +-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n"; ++print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ". Do not edit\n"; + print C_FILE " */\n"; + + # +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch b/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch new file mode 100644 index 000000000..dbeae5150 --- /dev/null +++ b/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch @@ -0,0 +1,70 @@ +From 3bd85c6c97b2d232638594bf828de62083fe3389 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Mon, 11 Mar 2024 12:30:18 +0100 +Subject: [PATCH] tty: vt: conmakehash: Don't mention the full path of the + input in output +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change strips $abs_srctree of the input file containing the +character mapping table in the generated output. The motivation for this +change is Yocto emitting a build warning + + WARNING: linux-lxatac-6.7-r0 do_package_qa: QA Issue: File /usr/src/debug/linux-lxatac/6.7-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-lxatac-src contains reference to TMPDIR + +So this change brings us one step closer to make the build result +reproducible independent of the build path. + +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/3bd85c6c97b2d232638594bf828de62083fe3389] + +Signed-off-by: Uwe Kleine-König +Link: https://lore.kernel.org/r/20240311113017.483101-2-u.kleine-koenig@pengutronix.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/vt/conmakehash.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c +index cddd789fe46e..dc2177fec715 100644 +--- a/drivers/tty/vt/conmakehash.c ++++ b/drivers/tty/vt/conmakehash.c +@@ -76,7 +76,8 @@ static void addpair(int fp, int un) + int main(int argc, char *argv[]) + { + FILE *ctbl; +- char *tblname; ++ const char *tblname, *rel_tblname; ++ const char *abs_srctree; + char buffer[65536]; + int fontlen; + int i, nuni, nent; +@@ -101,6 +102,16 @@ int main(int argc, char *argv[]) + } + } + ++ abs_srctree = getenv("abs_srctree"); ++ if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree))) ++ { ++ rel_tblname = tblname + strlen(abs_srctree); ++ while (*rel_tblname == '/') ++ ++rel_tblname; ++ } ++ else ++ rel_tblname = tblname; ++ + /* For now we assume the default font is always 256 characters. */ + fontlen = 256; + +@@ -253,7 +264,7 @@ int main(int argc, char *argv[]) + #include \n\ + \n\ + u8 dfont_unicount[%d] = \n\ +-{\n\t", argv[1], fontlen); ++{\n\t", rel_tblname, fontlen); + + for ( i = 0 ; i < fontlen ; i++ ) + { +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch b/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch new file mode 100644 index 000000000..b9ec1be3a --- /dev/null +++ b/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch @@ -0,0 +1,38 @@ +From fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f Mon Sep 17 00:00:00 2001 +From: Lucas Stach +Date: Wed, 10 Apr 2024 15:41:21 +0200 +Subject: [PATCH 6/6] video: logo: Drop full path of the input filename in + generated file + +Avoid this Yocto build warning to make build reproducible: + + WARNING: linux-foo-6.8-r0 do_package_qa: QA Issue: + File /usr/src/debug/linux-foo/6.8-r0/drivers/video/logo/logo_linux_clut224.c + in package linux-foo-src contains reference to TMPDIR + +Helge modified the patch to drop the whole line. + +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f] + +Signed-off-by: Lucas Stach +Signed-off-by: Helge Deller +--- + drivers/video/logo/pnmtologo.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c +index 2434a25afb64..8080c4d9c4a2 100644 +--- a/drivers/video/logo/pnmtologo.c ++++ b/drivers/video/logo/pnmtologo.c +@@ -235,8 +235,6 @@ static void write_header(void) + fputs("/*\n", out); + fputs(" * DO NOT EDIT THIS FILE!\n", out); + fputs(" *\n", out); +- fprintf(out, " * It was automatically generated from %s\n", filename); +- fputs(" *\n", out); + fprintf(out, " * Linux logo %s\n", logoname); + fputs(" */\n\n", out); + fputs("#include \n\n", out); +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.6.bb index 409e1f662..b90b40d33 100644 --- a/recipes-kernel/linux/linux-imx_6.6.bb +++ b/recipes-kernel/linux/linux-imx_6.6.bb @@ -1,5 +1,5 @@ # Copyright 2013-2016 (C) Freescale Semiconductor -# Copyright 2017-2023 (C) NXP +# Copyright 2017-2024 (C) NXP # Copyright 2018 (C) O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) # @@ -13,15 +13,21 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU require recipes-kernel/linux/linux-imx.inc SRCBRANCH = "lf-6.6.y" -LOCALVERSION = "-6.6.3-1.0.0" -SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" +LOCALVERSION = "-6.6.23-2.0.0" +SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387" + +SRC_URI += " \ + file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \ + file://0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch \ + file://0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch \ +" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "6.6.3" +LINUX_VERSION = "6.6.23" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" From e9c972a158b4bb6d87d9a4bdb9a7faa2b246a5f7 Mon Sep 17 00:00:00 2001 From: Rogerio Guerra Borin Date: Mon, 24 Jun 2024 22:25:44 -0300 Subject: [PATCH 22/30] imx-boot: inherit from uboot-config rather than uboot-sign Since commit 5e12dc911d0c541f43aa6d0c046fb87e8b7c1f7e on layer openembedded-core, the class uboot-sign is supposed to be inherited by u-boot recipes only, but the imx-boot recipe is currently inheriting it. With this commit we change this situation by inheriting from uboot-config instead so it can access relevant variables related to the U-Boot configuration without inheriting the tasks defined by uboot-sign which pertain exclusively to u-boot recipes (uboot_generate_rsa_keys, uboot_assemble_fitimage); this in turn allows us to get rid of the prepend to uboot_assemble_fitimage which only existed to allow that extraneous task to succeed. Nevertheless, the main issue solved by the commit is a conflict that happens when imx-boot is used together a U-Boot configured not to generate a boot container, i.e. with UBOOT_PROVIDES_BOOT_CONTAINER="0" in which case both the U-Boot and the imx-boot recipe would try to deploy the same files due to to extraneous tasks inherited, leading to build errors like this: ERROR: imx-boot-1.0-r0 do_deploy: Recipe imx-boot is trying to install files into a shared area when those files already exist. The files and the manifests listing them are: /workdir/.../deploy/images/colibri-imx8x/u-boot-colibri-imx8x.dtb (matched in manifest-colibri_imx8x-u-boot-toradex.deploy) /workdir/.../deploy/images/colibri-imx8x/u-boot.dtb (matched in manifest-colibri_imx8x-u-boot-toradex.deploy) ... As part of this change we set variable UBOOT_DTB_BINARY to match the setting in uboot-sign.bbclass, which duplicates information. This is not ideal but it should work as that value is unlikely to change. The ideal solution would likely be setting it in uboot-config.bbclass (provided by layer openembedded-core); that's left as a future improvement. Signed-off-by: Rogerio Guerra Borin (cherry picked from commit 45941f64766cd78f1491f74bf7483de52c43c9c5) Signed-off-by: Tom Hochstein (cherry picked from commit f50044623d99e4e5c72db2e1d1c97f16c8e8903a) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 2c9642147..3f62920cb 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -86,11 +86,7 @@ MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \ ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \ QSPI_HEADER=./scripts/fspi_header_133" -do_uboot_assemble_fitimage:prepend:imx-generic-bsp() { - for config in ${UBOOT_MACHINE}; do - mkdir -p ${B}/${config} - done -} +UBOOT_DTB_BINARY ?= "u-boot.dtb" compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build From af63551e94d74644a775f9dd0678dd00561b76a3 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Sat, 17 Aug 2024 19:51:25 -0300 Subject: [PATCH 23/30] jailhouse-imx: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update to the new NXP BSP 6.6.23-2.0.0. Signed-off-by: Hiago De Franco (cherry picked from commit 0643299b613dcccfa6fd731ba357a34ef69320e8) --- recipes-extended/jailhouse/jailhouse-imx_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index c230cc3a5..e4c34d7c1 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ PROVIDES = "jailhouse" RPROVIDES:${PN} += "jailhouse" -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "184a287f4c4c63a3842a3b582b5d700e0f9fd9a4" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "ce11ba42dfa34f96aca76016a51d21e5d2539001" IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ From 65b9fd2f4aeb2721408ce2ab1038581bb1cc665b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 19 Aug 2024 22:34:36 +0200 Subject: [PATCH 24/30] imx-alsa-plugins_git: fix buildpath error Do not drop the OE provided settings of CFLAGS. While at it, drop the additional indirection through the INCLUDE_DIR variable. Fixes: | WARNING: imx-alsa-plugins-1.0.26+-r0 do_package_qa: QA Issue: File ...libasound_module_pcm_cicFilter.so in package imx-alsa-plugins-dbg contains reference to TMPDIR Signed-off-by: Max Krummenacher (cherry picked from commit fc8a552046654900e65bff8848af66d21be70f3f) --- recipes-multimedia/alsa/imx-alsa-plugins_git.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index faa417686..b05c3a48c 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb @@ -25,9 +25,7 @@ SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331" S = "${WORKDIR}/git" -INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}" - -EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}"" +CFLAGS:append = " -I${STAGING_INCDIR_IMX}" PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}" PACKAGECONFIG_SWPDM = "" From cbb50af72924c9b979844187dc622384e0547b8d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 19 Aug 2024 20:55:33 -0700 Subject: [PATCH 25/30] imx-base: Bump weston P_V to 12.0.4.imx 12.0.3.imx is gone from metadata Signed-off-by: Khem Raj (cherry picked from commit 5b22cd90a88e61b49791ab620d2363e322ed31f8) --- conf/machine/include/imx-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 8ef1e2819..f8f677404 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -566,7 +566,7 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.3.imx" +PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.4.imx" # i.MX 6 & 7 stay on weston 10.0 for fbdev PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" From 4d64dde1686a017ebe2763dd7880563a6fc51b53 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 19 Aug 2024 10:28:08 -0700 Subject: [PATCH 26/30] imx-boot: Fix 8M multi-config build problems Building in the NXP layer meta-imx with the latest imx-boot recipe, the dtb is not found during mkimage build: ``` | NOTE: building iMX8MP - TEE=tee.bin-stmm flash_evk_stmm_capsule | dtc -@ -I dts -O dtb -o signature.dtbo signature.dts | fdtoverlay -i imx8mp-evk.dtb -o imx8mp-evk.dtb signature.dtbo | Couldn't open blob from 'imx8mp-evk.dtb': No such file or directory ``` The problem is the recipe does now copy the dtb from u-boot-imx with a config-adorned name, e.g., imx8mp-evk.dtb-sd, but mkimage is still expecting imx8mp-evk.dtb. Add a link for compatibility. Signed-off-by: Tom Hochstein (cherry picked from commit 2db7047ba40efed4d9e7c86c63d71158d974e297) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 3f62920cb..a0b127ed5 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -102,17 +102,19 @@ compile_mx8m() { if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then # Use DTB binary patched with signature node - cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA} + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA} else - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING} + cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \ + ${BOOT_STAGING} fi + ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME} cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ ${BOOT_STAGING}/u-boot-nodtb.bin cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin - cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin } From 114a59350ab598e87afb3d3f5867b21bf5117cd7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 20 Aug 2024 12:43:40 -0700 Subject: [PATCH 27/30] imx-boot: Update to latest from NXP 6.6.23-2.0.0 - Add i.MX 91 support - Add missing STMM deploy Signed-off-by: Tom Hochstein (cherry picked from commit 9cbfa8f33730e59e8be810ecdd3967738b07380a) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 40 ++++++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a0b127ed5..d258c112c 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2020 NXP +# Copyright (C) 2017-2024 NXP require imx-mkimage_git.inc @@ -18,6 +18,7 @@ DEPENDS += " \ # xxd is a dependency of fspi_packer.sh DEPENDS += "xxd-native" DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native" +DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" @@ -52,6 +53,7 @@ TOOLS_NAME ?= "mkimage_imx8" IMX_BOOT_SOC_TARGET ?= "INVALID" DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" +DEPLOY_OPTEE_STMM = "${@bb.utils.contains('MACHINE_FEATURES', 'optee stmm', 'true', 'false', d)}" IMXBOOT_TARGETS ?= \ "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ @@ -61,8 +63,8 @@ IMXBOOT_TARGETS ?= \ BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M" BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX" -BOOT_STAGING:mx91p-generic-bsp = "${S}/iMX91" -BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93" +BOOT_STAGING:mx91-generic-bsp = "${S}/iMX91" +BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93" BOOT_STAGING:mx95-generic-bsp = "${S}/iMX95" SOC_FAMILY = "INVALID" @@ -70,7 +72,7 @@ SOC_FAMILY:mx8-generic-bsp = "mx8" SOC_FAMILY:mx8m-generic-bsp = "mx8m" SOC_FAMILY:mx8x-generic-bsp = "mx8x" SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp" -SOC_FAMILY:mx91p-generic-bsp = "mx93" +SOC_FAMILY:mx91-generic-bsp = "mx91" SOC_FAMILY:mx93-generic-bsp = "mx93" SOC_FAMILY:mx95-generic-bsp = "mx95" @@ -154,6 +156,11 @@ compile_mx8ulp() { fi } +compile_mx91() { + bbnote i.MX 91 boot binary build + compile_mx93 +} + compile_mx93() { bbnote i.MX 93 boot binary build for ddr_firmware in ${DDR_FIRMWARE_NAME}; do @@ -220,21 +227,26 @@ do_compile() { for target in ${IMXBOOT_TARGETS}; do compile_${SOC_FAMILY} - if [ "$target" = "flash_linux_m4_no_v2x" ]; then + case $target in + *no_v2x) # Special target build for i.MX 8DXL with V2X off bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME_EXTRA} flash_linux_m4 - elif [[ $target == *sttm_capsule ]]; then + ;; + *stmm_capsule) # target for flash_evk_stmm_capsule or # flash_singleboot_stmm_capsule cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING} bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}" cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING} make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target} - else + ;; + *) bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}" make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${target} - fi + ;; + esac + if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} fi @@ -317,6 +329,10 @@ deploy_mx8ulp() { fi } +deploy_mx91() { + deploy_mx93 +} + deploy_mx93() { install -d ${DEPLOYDIR}/${BOOT_TOOLS} @@ -354,6 +370,14 @@ do_deploy() { # copy makefile (soc.mak) for reference install -m 0644 ${BOOT_STAGING}/soc.mak ${DEPLOYDIR}/${BOOT_TOOLS} + # copy stmm files to deploy path + if ${DEPLOY_OPTEE_STMM}; then + install -m 0644 ${BOOT_STAGING}/tee.bin-stmm ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0644 ${BOOT_STAGING}/capsule1.bin ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0644 ${BOOT_STAGING}/CRT.* ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0755 ${BOOT_STAGING}/mkeficapsule ${DEPLOYDIR}/${BOOT_TOOLS} + fi + for type in ${UBOOT_CONFIG}; do UBOOT_CONFIG_EXTRA="$type" UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" From 1518b358de1c91d7ab21ecedec3a65dde1791a6a Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Wed, 21 Aug 2024 17:09:49 -0300 Subject: [PATCH 28/30] mcore-demos: Update 6.6.3-1.0.0 to 6.6.23-2.0.0 Update to the new NXP BSP 6.6.23-2.0.0. - Replace m33 demos 2.14.1 and 2.15.000 with 2.16.000 version. - Replace m4 demos 2.14.0 and 2.14.1 with 2.16.000 version, and fix 2.9.0 license checksum. - Replace m7 demos 2.14.0, 2.14.1 and 2.15.000 with 2.16.000 version. - Fix SRC_URI from imx-mcore-demos wich was causing the link to have an extra '/', making the download fail. Signed-off-by: Hiago De Franco (cherry picked from commit d8510db5c0ede0739ede6deff0f17ad8cfc5de3d) --- recipes-fsl/mcore-demos/README | 10 +++---- .../mcore-demos/imx-m33-demos_2.14.1.bb | 11 -------- .../mcore-demos/imx-m33-demos_2.15.000.bb | 11 -------- .../mcore-demos/imx-m33-demos_2.16.000.bb | 15 +++++++++++ .../mcore-demos/imx-m4-demos_2.14.0.bb | 15 ----------- .../mcore-demos/imx-m4-demos_2.14.1.bb | 11 -------- .../mcore-demos/imx-m4-demos_2.16.000.bb | 19 ++++++++++++++ recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb | 1 + .../mcore-demos/imx-m7-demos_2.14.0.bb | 15 ----------- .../mcore-demos/imx-m7-demos_2.14.1.bb | 12 --------- .../mcore-demos/imx-m7-demos_2.15.000.bb | 11 -------- .../mcore-demos/imx-m7-demos_2.16.000.bb | 26 +++++++++++++++++++ recipes-fsl/mcore-demos/imx-mcore-demos.inc | 2 +- 13 files changed, 65 insertions(+), 94 deletions(-) delete mode 100644 recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb create mode 100644 recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb create mode 100644 recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb delete mode 100644 recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb create mode 100644 recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb diff --git a/recipes-fsl/mcore-demos/README b/recipes-fsl/mcore-demos/README index f38e8a6ed..0c9944873 100644 --- a/recipes-fsl/mcore-demos/README +++ b/recipes-fsl/mcore-demos/README @@ -1,14 +1,10 @@ The M4 demo app version of each SoCs are followed: -* 2.14.0 -- i.MX 7ULP, 8MQ -* 2.14.1 -- i.MX 8MM +* 2.16.000 -- i.MX 7ULP, 8MQ, 8MM * 2.9.0 -- i.MX 8DXL, 8QM, 8QXP * 1.0.1 -- i.MX 7D The M7 demo app version of each SoCs are followed: -* 2.14.0 -- i.MX 8MNULite, 8MN -* 2.14.1 -- i.MX 8MP -* 2.15.000 -- i.MX95 +* 2.16.000 -- i.MX 8MP , 8MNULite, 8MN, i.MX95 The M33 demo app version of each SoCs are followed: -* 2.14.1 -- i.MX 8ULP -* 2.15.000 -- i.MX 93 +* 2.16.000 -- i.MX 8ULP, i.MX 93 diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb deleted file mode 100644 index 0107d90e6..000000000 --- a/recipes-fsl/mcore-demos/imx-m33-demos_2.14.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[imx8ulp.md5sum] = "6a1d2b904255ad2b514a234e6282209f" -SRC_URI[imx8ulp.sha256sum] = "eb8710c31dd58e23ed50653a1b90106e78776a1062abea2a16139cf371828a5a" - -COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb deleted file mode 100644 index 542ff168a..000000000 --- a/recipes-fsl/mcore-demos/imx-m33-demos_2.15.000.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" - -SRC_URI[imx93.md5sum] = "2fad663ff63d273a2cb775e06db9eedc" -SRC_URI[imx93.sha256sum] = "257066cbd57add127fae15da72f12f1cf6a847ff300e7b4ac63f507693898dfa" - -COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb new file mode 100644 index 000000000..430182ae3 --- /dev/null +++ b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb @@ -0,0 +1,15 @@ +# Copyright 2023-2024 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-mcore-demos.inc + +LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +SRC_URI[imx8ulp.md5sum] = "9db44ac8ae50c2ce37072c89d54bf794" +SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b" + +SRC_URI[imx93.md5sum] = "293b097136b5c2c857057d1724b468ac" +SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526" + +COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb deleted file mode 100644 index b2076cca6..000000000 --- a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2017-2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac" -LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac" - -SRC_URI[imx8mq.md5sum] = "0235860aca583e50af88b141e8f25d13" -SRC_URI[imx8mq.sha256sum] = "decb52b246800e3fa926704207a0ac9a960723da8502887a31f353aaa370c9d9" - -SRC_URI[imx7ulp.md5sum] = "4ec757b7a2a2bdf33f583c328a4631f1" -SRC_URI[imx7ulp.sha256sum] = "51715bee5e300ee6160c92979e7075e3aa7f7114e7742699bfaa9779113a6fe9" - -COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mq-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb deleted file mode 100644 index 67fadb2f6..000000000 --- a/recipes-fsl/mcore-demos/imx-m4-demos_2.14.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2017-2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[imx8mm.md5sum] = "8db99da9efe8a5409a246c8a63d418dc" -SRC_URI[imx8mm.sha256sum] = "8269d7461efcdba0b8c3e684df8b45c2d8ace3fdf426b81bdfb46855a1577987" - -COMPATIBLE_MACHINE = "(mx8mm-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb new file mode 100644 index 000000000..435471c8e --- /dev/null +++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb @@ -0,0 +1,19 @@ +# Copyright 2017-2024 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-mcore-demos.inc + +LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +SRC_URI[imx7ulp.md5sum] = "f971b57a6787adf24bf1135b69847c65" +SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b" + +SRC_URI[imx8mm.md5sum] = "fe3d6cba7ad25f90f4cfdf22221ddd21" +SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24" + +SRC_URI[imx8mq.md5sum] = "e6da3b5fda929ac6989c7aa7633a9ab6" +SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25" + +COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb index 63c402dda..888fd647d 100644 --- a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb +++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb @@ -6,6 +6,7 @@ require imx-mcore-demos.inc LIC_FILES_CHKSUM:mx8dxl-nxp-bsp = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" LIC_FILES_CHKSUM:mx8qm-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" LIC_FILES_CHKSUM:mx8qxp-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" +LIC_FILES_CHKSUM:mx8dx-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12" SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1" diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb deleted file mode 100644 index 7849ccca2..000000000 --- a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2019-2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac" -LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=9135422c7a38dac21bf1f858b6ef3bac" - -SRC_URI[imx8mn.md5sum] = "5ba15434b72f1eb7315e6ddb8a66a0f9" -SRC_URI[imx8mn.sha256sum] = "8fe6c76da7eb0bbebb8e18a308249ca78a1c5c1d58034cf0fd3c5028aa5740e2" - -SRC_URI[imx8mnddr3l.md5sum] = "62115bc3415eac0f9a4249ed9bb94f98" -SRC_URI[imx8mnddr3l.sha256sum] = "4b405e1ae439f651c21c4d4bd88f89695974a15aabb89cba65daa2f9922b273d" - -COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb deleted file mode 100644 index ddd996619..000000000 --- a/recipes-fsl/mcore-demos/imx-m7-demos_2.14.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" -LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[imx8mp.md5sum] = "f12cd36cd48cfc65ada700445f8cecaf" -SRC_URI[imx8mp.sha256sum] = "f2da9e7d7ea6d7b5f33eb12d20e6c5c07fe3110d362f5263d672729f2cd73b37" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp|mx8mpul-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb deleted file mode 100644 index 077942054..000000000 --- a/recipes-fsl/mcore-demos/imx-m7-demos_2.15.000.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require imx-mcore-demos.inc - -LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" - -SRC_URI[imx95.md5sum] = "572b54c7255faa020612261462bdd96b" -SRC_URI[imx95.sha256sum] = "118ea2248d7fd8a48412855fc19ff6f37f4e09e6d387dfdd458bb9a19d6192c6" - -COMPATIBLE_MACHINE = "(mx95-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb new file mode 100644 index 000000000..fab57a7f7 --- /dev/null +++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb @@ -0,0 +1,26 @@ +# Copyright 2023-2024 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-mcore-demos.inc + +LIC_FILES_CHKSUM:mx8mn-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +LIC_FILES_CHKSUM:mx8mnul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +LIC_FILES_CHKSUM:mx8mp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +SRC_URI[imx8mn.md5sum] = "b7e2733d8f6c9469b52b36cf6dad1c5e" +SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c" + +SRC_URI[imx8mnddr3l.md5sum] = "c99fdb271ab42390537845a6beb15cf3" +SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28" + +SRC_URI[imx8mp.md5sum] = "4260822516833e8cedec61dd5be24e3e" +SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1" + +SRC_URI[imx95.md5sum] = "f9576f3a4fe730c111c877344ea93427" +SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1" + +COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)" diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc index 32afc3123..11621752f 100644 --- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc +++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc @@ -32,7 +32,7 @@ MCORE_TYPE:mx8ulp-nxp-bsp = "m33" MCORE_TYPE:mx93-nxp-bsp = "m33" MCORE_TYPE:mx95-nxp-bsp = "m7" -SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true" +SRC_URI = "${FSL_MIRROR}${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true" S = "${WORKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}" From 2d85013446aa8fc5d51d9e9a00cc9d9ba38ecc3d Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Wed, 21 Aug 2024 17:31:17 -0300 Subject: [PATCH 29/30] firmware-ele-imx: Bump to version 0.1.2 This aligns with the current version available on meta-imx layer. Signed-off-by: Hiago De Franco (cherry picked from commit e30df90c5edd31e76c64eda949f1ad7eb73e2783) --- ...are-ele-imx_0.1.1.bb => firmware-ele-imx_0.1.2.bb} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename recipes-bsp/firmware-imx/{firmware-ele-imx_0.1.1.bb => firmware-ele-imx_0.1.2.bb} (75%) diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb similarity index 75% rename from recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb rename to recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb index 70252c01c..f97d21ad9 100644 --- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb +++ b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.2.bb @@ -3,13 +3,16 @@ SUMMARY = "NXP i.MX ELE firmware" DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" inherit fsl-eula-unpack use-imx-security-controller-firmware deploy -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "f4df2005ec4555e9f177acbf62a7a969" -SRC_URI[sha256sum] = "3f69d6cf6ea448c5c2f87b6acdad1c5c2318616d246cc5047a523f2543fee408" +SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" +IMX_SRCREV_ABBREV = "4ed450a" +SRC_URI[md5sum] = "1359bc7d378bddfe1d8479eba05b05ec" +SRC_URI[sha256sum] = "d858fcbb47482a898a1af5fe5f3f8be53bb21fac793b33e9bcdfd2b4dda79d3c" + +S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" do_compile[noexec] = "1" From 572d90d55afeb1c1fb8db95747e2ba00e0bb7cfc Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 23 Aug 2024 14:13:22 +0300 Subject: [PATCH 30/30] optee: Upgrade optee recipes from 4.0.0.imx to 4.2.0.imx Update file headers Signed-off-by: Valentin Jec (cherry picked from commit 79fd80f199084f5dd980f6b754d167a793fef2c6) --- recipes-security/optee-imx/optee-client-fslc-imx.inc | 2 +- recipes-security/optee-imx/optee-client-fslc.inc | 2 +- ...{optee-client_4.0.0.imx.bb => optee-client_4.2.0.imx.bb} | 4 ++-- .../{optee-os_4.0.0.imx.bb => optee-os_4.2.0.imx.bb} | 6 +++--- .../{optee-test_4.0.0.imx.bb => optee-test_4.2.0.imx.bb} | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename recipes-security/optee-imx/{optee-client_4.0.0.imx.bb => optee-client_4.2.0.imx.bb} (54%) rename recipes-security/optee-imx/{optee-os_4.0.0.imx.bb => optee-os_4.2.0.imx.bb} (73%) rename recipes-security/optee-imx/{optee-test_4.0.0.imx.bb => optee-test_4.2.0.imx.bb} (59%) diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc index 4cfe18bf8..60e9e1fa5 100644 --- a/recipes-security/optee-imx/optee-client-fslc-imx.inc +++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP require optee-client-fslc.inc diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc index 92f9f1d1f..aca2aff6c 100644 --- a/recipes-security/optee-imx/optee-client-fslc.inc +++ b/recipes-security/optee-imx/optee-client-fslc.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP SUMMARY = "OPTEE Client libs" HOMEPAGE = "http://www.optee.org/" diff --git a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb similarity index 54% rename from recipes-security/optee-imx/optee-client_4.0.0.imx.bb rename to recipes-security/optee-imx/optee-client_4.2.0.imx.bb index b404dd5b7..64b49b752 100644 --- a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb @@ -1,7 +1,7 @@ require optee-client-fslc-imx.inc -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0" DEPENDS += "util-linux" EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" diff --git a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb similarity index 73% rename from recipes-security/optee-imx/optee-os_4.0.0.imx.bb rename to recipes-security/optee-imx/optee-os_4.2.0.imx.bb index ad6c6b406..96948bc7b 100644 --- a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP require optee-os-fslc-imx.inc @@ -8,5 +8,5 @@ SRC_URI += " \ file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \ file://0004-core-link-add-no-warn-rwx-segments.patch \ " -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "e0a3e77735941e6057a1994a576b83a93ea0bdb9" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "c6be5b572452a2808d1a34588fd10e71715e23cf" diff --git a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb similarity index 59% rename from recipes-security/optee-imx/optee-test_4.0.0.imx.bb rename to recipes-security/optee-imx/optee-test_4.2.0.imx.bb index 1717a713f..aa8444fba 100644 --- a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb @@ -1,10 +1,10 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP require optee-test-fslc.inc SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "95c49d950f50fa774e4530d19a967079b3b61279" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "07682f1b1b41ec0bfa507286979b36ab8d344a96" COMPATIBLE_MACHINE = "(imx-nxp-bsp)"