From 0eac105aa1b7b36bceda851e5f380fcef40eebab Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 17 Oct 2023 09:09:59 -0300 Subject: [PATCH 1/4] linux-imx: Update lf-6.1.22_2.0.0 to lf-6.1.36_2.1.0 Update the linux-imx kernel to be aligned with the NXP BSP LF6.1.36_2.1.0. Remove two patches as they are not needed any more. New dts files for several machines: - imx8mp-evk-sof-pdm.dtb - imx8qxp-mek-enet2.dtb - imx8qxp-mek-enet2-sja1105.dtb - imx8qxp-mek-enet2-tja1100.dtb - imx93-14x14-evk-sja1105.dtb - imx93-14x14-evk-flexspi-m2.dtb - imx93-9x9-qsb-rpmsg.dtb - imx93-9x9-qsb-rpmsg-lpv.dtb New board supported: imx91p-9x9-qsb Signed-off-by: Daiane Angolini --- ...7_defconfig-Remove-KERNEL_LZO-config.patch | 27 -------------- ...pu-viv-Fix-enum-int-mismatch-warning.patch | 37 ------------------- recipes-kernel/linux/linux-imx_6.1.bb | 10 ++--- 3 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch delete mode 100644 recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch diff --git a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch b/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch deleted file mode 100644 index 59490768c0..0000000000 --- a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Tue, 23 May 2023 13:16:05 -0300 -Subject: [PATCH] ARM: imx_v7_defconfig: Remove KERNEL_LZO config - -The KERNEL_GZIP is used in most config and is the default, there is no -clear reason to diverge so let default be used. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - arch/arm/configs/imx_v7_defconfig | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig -index 6de3049689191..94e9457e2bab1 100644 ---- a/arch/arm/configs/imx_v7_defconfig -+++ b/arch/arm/configs/imx_v7_defconfig -@@ -1,4 +1,3 @@ --CONFIG_KERNEL_LZO=y - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y - CONFIG_NO_HZ=y --- -2.40.1 - diff --git a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch b/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch deleted file mode 100644 index a917a2435b..0000000000 --- a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 168e36d8879e3f5c4cf57ed74c10f6c134e45638 Mon Sep 17 00:00:00 2001 -From: Daiane Angolini -Date: Tue, 25 Jul 2023 10:54:45 -0300 -Subject: [PATCH] drivers:mxc-gpu-viv: Fix enum-int-mismatch warning - -Fix the warning (treated as error): - -ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] -| 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) -| | ^~~~~~~~~~~~ -| In file included from /(...)tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56: -| /(...)/buildw/tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:341:1: note: previous declaration of '_QuerySignal' with type 'gctBOOL(struct _gckOS *, void *)' {aka 'int(struct _gckOS *, void *)'} -| 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); -| | ^~~~~~~~~~~~ -| cc1: all warnings being treated as errors - -Signed-off-by: Daiane Angolini ---- - drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h -index 61edf03571443..b4c1cbf414846 100644 ---- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h -+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h -@@ -337,7 +337,7 @@ _ConvertLogical2Physical(IN gckOS Os, - IN PLINUX_MDL Mdl, - OUT gctPHYS_ADDR_T *Physical); - --gctBOOL -+gceSTATUS - _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); - - static inline gctINT --- -2.34.1 - diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index 574ba04d9f..f8a9ce1d4e 100644 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ b/recipes-kernel/linux/linux-imx_6.1.bb @@ -12,20 +12,16 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU require recipes-kernel/linux/linux-imx.inc -SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \ - file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \ - " - SRCBRANCH = "lf-6.1.y" -LOCALVERSION = "-6.1.22-2.0.0" -SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67" +LOCALVERSION = "-6.1.36-2.1.0" +SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" # 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.1.22" +LINUX_VERSION = "6.1.36" KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" From b35c2cac06868fe00df07015d2547855c8890fcd Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 17 Oct 2023 09:33:24 -0300 Subject: [PATCH 2/4] imx8mp-lpddr4-evk: Include dts for lf-6.1.36_2.1.0 Add the dts freescale/imx8mp-evk-sof-pdm.dtb to be built. Signed-off-by: Daiane Angolini --- conf/machine/imx8mp-lpddr4-evk.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index 39108716ad..0a50040ae6 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -42,6 +42,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/imx8mp-evk-rpmsg.dtb \ freescale/imx8mp-evk-rpmsg-lpv.dtb \ freescale/imx8mp-evk-sof-wm8960.dtb \ + freescale/imx8mp-evk-sof-pdm.dtb \ freescale/imx8mp-evk-spdif-lb.dtb \ freescale/imx8mp-evk-usdhc1-m2.dtb \ freescale/imx8mp-evk-8mic-swpdm.dtb \ From 7ebfbdc9c9c168c85beb551ae1b8d7dbc2c2aab1 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 17 Oct 2023 09:56:56 -0300 Subject: [PATCH 3/4] imx8qxp-mek: Include dts for lf-6.1.36_2.1.0 Add the following dtb to be built: freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-sja1105.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ /media/daiane/TRIFORCE/yocto/master/buildw-fsl/workspace \ Signed-off-by: Daiane Angolini --- conf/machine/imx8qxp-mek.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 877ac55ff2..72867a9599 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf @@ -16,6 +16,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199-rpmsg.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-sja1105.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ From 3ba4648178977044a813b3c34f79176bb4e575e6 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 17 Oct 2023 09:58:38 -0300 Subject: [PATCH 4/4] imx93-9x9-lpddr4-qsb: Include dts for lf-6.1.36_2.1.0 Add the following dtb to be built: freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb Signed-off-by: Daiane Angolini --- conf/machine/imx93-9x9-lpddr4-qsb.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf index 01843aca73..f6e7f3a60f 100644 --- a/conf/machine/imx93-9x9-lpddr4-qsb.conf +++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf @@ -18,6 +18,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \ " UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"