From 975179cf83b8451c919700bc26665c09e4759ba4 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 24 Apr 2024 11:54:50 +0300 Subject: linux-fslc: Update from v6.6.26 to v6.6.28 The linux-fslc has been updated up to v6.6.28 from the stable kernel version. Signed-off-by: Oleksandr Suvorov --- recipes-kernel/linux/linux-fslc_6.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb index e0e68c0bd..9132435e4 100644 --- a/recipes-kernel/linux/linux-fslc_6.6.bb +++ b/recipes-kernel/linux/linux-fslc_6.6.bb @@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= # # 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.26" +LINUX_VERSION = "6.6.28" KBRANCH = "6.6.x+fslc" -SRCREV = "829705b49b55e0ea4dbb12ed23996a12d01898bf" +SRCREV = "3beb6fac2c3bda9015892dae8556c5559f2ee234" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" -- cgit v1.2.3-54-g00ecf From df779d254727962dd025aef675e6c144e03f4fe7 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 30 Apr 2024 18:39:13 +0300 Subject: linux-fslc-imx: Update up to 6.6.28 Update linux-fslc-imx to 6.6.28. Also fix the recipe to be 6.6-specific. Signed-off-by: Oleksandr Suvorov --- recipes-kernel/linux/linux-fslc-imx_6.6.bb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb index 6e31c1e2a..9511d6549 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb @@ -12,8 +12,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community." ############################################################################### # This recipe (and corresponding kernel repository and branch) receives updates # from 3 different sources: -# 1. Stable [linux-6.1.y] branch updates of korg; -# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; +# 1. Stable [linux-6.6.y] branch updates of korg; +# 2. NXP-specific updates via branch [lf-6.6.y] shared via GitHub NXP repo; # 3. Critical patches, which are not (yet) integrated into either of 2 above # sources, but are required to be applied to the kernel tree. # @@ -28,23 +28,20 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v6.1.70 +# tag: v6.6.28 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: lf-6.1.55-2.2.0 +# tag: lf-6.6.3-1.0.00 # # ------------------------------------------------------------------------------ # 3. Critical patches (SHA(s)) # ------------------------------------------------------------------------------ -# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" -# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif -# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS -# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config -# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X -# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype -# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype +# - f67cb9a5b4fb7 Revert "net: stmmac: fix FPE events losing" +# - 1918c2eb8b07f Revert "dmaengine: fsl-edma: fix DMA channel leak in eDMAv4" +# - 42289407ee38f Revert "dmaengine: fsl-edma: Add judgment on enabling round robin arbitration" +# - 952f79923f055 Revert "dmaengine: fsl-edma: Do not suspend and resume the masked dma channel when the system is sleeping" # # NOTE to upgraders: # This recipe should NOT collect individual patches, they should be applied to @@ -56,14 +53,14 @@ require linux-imx.inc KBRANCH = "6.6-1.0.x-imx" SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" -SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" +SRCREV = "776652a165f5bbf30c68a5f6213d75b02e8df11c" # 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.28" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" -- cgit v1.2.3-54-g00ecf From 4efedfa3e404c97606af0a950f9371ebade1df7b Mon Sep 17 00:00:00 2001 From: maffan Date: Fri, 3 May 2024 09:30:35 +0200 Subject: kernel-module-nxp-wlan: Update to 6.6.3-1.0.0 Relevant changes: - a84df58 mxm_wifiex: fix wlan_cmd_mfg_otp_rw() build warnings - 08c1478 mxm_wifiex: update to mxm6x17437.p3 release - 0eeb07c mxm_wifiex: update to mxm6x17437 release - c3a62ac mxm_wifiex: fix L6.7 kernel next tree build warnings - 84aa954 mxm_wifiex: fix L6.7 kernel next tree build errors -- woal_cfg80211_set_beacon --- recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0bf6154d0..48e9cc3bc 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb @@ -8,10 +8,10 @@ RREPLACES:${PN} = "kernel-module-nxp89xx" RPROVIDES:${PN} = "kernel-module-nxp89xx" RCONFLICTS:${PN} = "kernel-module-nxp89xx" -SRCBRANCH = "lf-6.1.55_2.2.0" +SRCBRANCH = "lf-6.6.3_1.0.0" MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" -SRCREV = "952d10f3349426f917636a4560974117eb6eef5b" +SRCREV = "a84df583155bad2a396a937056805550bdf655ab" S = "${WORKDIR}/git/mxm_wifiex/wlan_src" -- cgit v1.2.3-54-g00ecf From 1e88b88a4b68ef1a302d89ed8d405bd0b63e0de7 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 3 May 2024 11:59:49 +0300 Subject: imx-lib: Update lf-6.1.55-2.2.0 to lf-6.6.3-1.0.0 No actual changes, just rename a source branch. Signed-off-by: Oleksandr Suvorov --- 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 74b7bddf7..d06ccfa10 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.1.55_2.2.0" +SRCBRANCH = "lf-6.6.3_1.0.0" SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 1febf170368d11448598fd41e65ac21d85d4ce03 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 3 May 2024 12:05:45 +0300 Subject: kernel-module-isp-vvcam: 4.2.2.24.0 -> 4.2.2.24.1 Update to the version used in NXP Yocto branch `nanbield-6.6.3-1.0.0`. Relevant changes: - 2102360 M865SW-1204: Fix camera can't work when multi-thread open the same pipeline - a68df9d LF-9283: vvcam: intermittent build failure error opening file: .vvbuf.o.d - 9ba4003 LF-10164: vvcam: bugfix: Remove no used files in vvcam - ed096d6 LF-10166: vvcam: bugfix: Colorspace cause v4l2-compliance failed - 4d0660e M865SW-1173: imx8mp isp: enable latency measurement - 79d8dfa M865SW-1192: ISP driver: vvcam:CONFIG_VIDEOBUF2_DMA_CONTIG leaded vvcam build error - 8cf91bb LF-10167: vvcam: bugfix: colorspace is different between save and load xml - 9c3c367 LF-10010-3: capture: vvcam: fix rebasing to next-20230804 met kernel dump - c08b7d9 LF-9945 capture: vvcam: fix build errors after rebasing to next-20230804 Signed-off-by: Oleksandr Suvorov --- .../kernel-module-isp-vvcam_4.2.2.24.0.bb | 20 -------------------- .../kernel-module-isp-vvcam_4.2.2.24.1.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb deleted file mode 100644 index d5804634f..000000000 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2020-2023 NXP - -DESCRIPTION = "Kernel loadable module for ISP" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" - -SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" -ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" -SRCBRANCH = "lf-6.1.55_2.2.0" -SRCREV = "2c762259b979d7ec5a2e17df6ad823de49d43a28" - -S = "${WORKDIR}/git/vvcam/v4l2" - -inherit module - -DEBUG_PREFIX_MAP:prepend = " \ - -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb new file mode 100644 index 000000000..d2c63aa05 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb @@ -0,0 +1,20 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" +ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" +SRCBRANCH = "lf-6.6.3_1.0.0" +SRCREV = "2102360b58d9d1b36bc0c654c8301e4014b33951" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +DEBUG_PREFIX_MAP:prepend = " \ + -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} " + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From d3dd29f4a1b5e033222a8f3ab971f64f8e24b217 Mon Sep 17 00:00:00 2001 From: Benjamin Szőke Date: Wed, 8 May 2024 12:01:12 +0200 Subject: firmware-imx: sync firmware-imx_8.23.bb with meta-imx-bsp layer --- recipes-bsp/firmware-imx/firmware-imx_8.23.bb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb index a9e36b5e7..900b9386c 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright 2017-2021 NXP +# Copyright 2017-2021,2023 NXP # Copyright (C) 2018 O.S. Systems Software LTDA. SUMMARY = "Freescale i.MX firmware" DESCRIPTION = "Freescale i.MX firmware such as for the VPU" @@ -16,8 +16,9 @@ do_install() { # SDMA Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma - rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin - rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin + # Comment these lines to use sdma-imx6q/7d.bin from here and not linux-firmware + #rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + #rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin # EASRC Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc @@ -53,6 +54,11 @@ do_install() { # as some of other files are provided by packages from other recipes. install -d ${D}${nonarch_base_libdir}/firmware/vpu install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu + # Update i.MX8 vpu firmware path to align with kernel6.5+ + install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/ + mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/ + # Install i.MX 95 VPU firmware + install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware } # @@ -88,6 +94,7 @@ python populate_packages:prepend() { os.chdir(cwd) + easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', output_pattern='firmware-imx-easrc-%s', @@ -144,7 +151,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu # is empty. # Therefore, we opt-out from producing -dev package here, since also for firmware # files it makes no sense. -PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" +PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-imx8 ${PN}-vpu-imx95" FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" FILES:${PN}-hdmi = " \ @@ -152,5 +159,7 @@ FILES:${PN}-hdmi = " \ ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ ${nonarch_base_libdir}/firmware/dpfw.bin \ " +FILES:${PN}-vpu-imx8 = "${nonarch_base_libdir}/firmware/amphion/vpu/*" +FILES:${PN}-vpu-imx95 = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin" COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf From 9a5222079674f7b1fae890bcdf2f5d5e39c2cc3a Mon Sep 17 00:00:00 2001 From: Benjamin Szőke Date: Sun, 12 May 2024 18:37:22 +0200 Subject: firmware-imx: Use vpu-amphion and vpu-wave suffix. --- recipes-bsp/firmware-imx/firmware-imx_8.23.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb index 900b9386c..1943f2057 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb @@ -151,7 +151,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu # is empty. # Therefore, we opt-out from producing -dev package here, since also for firmware # files it makes no sense. -PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-imx8 ${PN}-vpu-imx95" +PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave" FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" FILES:${PN}-hdmi = " \ @@ -159,7 +159,7 @@ FILES:${PN}-hdmi = " \ ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ ${nonarch_base_libdir}/firmware/dpfw.bin \ " -FILES:${PN}-vpu-imx8 = "${nonarch_base_libdir}/firmware/amphion/vpu/*" -FILES:${PN}-vpu-imx95 = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin" +FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*" +FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin" COMPATIBLE_MACHINE = "(imx-generic-bsp)" -- cgit v1.2.3-54-g00ecf From 46a800cccd23243b94c3a0b256b2f0d5201abd58 Mon Sep 17 00:00:00 2001 From: Benjamin Szőke Date: Sun, 12 May 2024 18:55:41 +0200 Subject: firmware-imx: introduce IMX_USE_LINUX_FIRMWARE_SDMA to configure sdma firmware sources --- recipes-bsp/firmware-imx/firmware-imx_8.23.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb index 1943f2057..0c935b92e 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb @@ -10,15 +10,21 @@ PE = "1" inherit allarch +IMX_USE_LINUX_FIRMWARE_SDMA ?= "1" + do_install() { install -d ${D}${nonarch_base_libdir}/firmware/imx # SDMA Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma - # Comment these lines to use sdma-imx6q/7d.bin from here and not linux-firmware - #rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin - #rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin + # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf + # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware + if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ] + then + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin + fi # EASRC Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc -- cgit v1.2.3-54-g00ecf