diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-10-17 09:09:59 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-10-17 10:28:08 -0300 |
commit | 0eac105aa1b7b36bceda851e5f380fcef40eebab (patch) | |
tree | be9243543d9ec62cd6b126cf1eb54d721c0cc3da /recipes-kernel | |
parent | 7327e03c61823268a5a957fe090c4cc5e1735b34 (diff) | |
download | meta-freescale-0eac105aa1b7b36bceda851e5f380fcef40eebab.tar.gz |
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 <daiane.angolini@foundries.io>
Diffstat (limited to 'recipes-kernel')
3 files changed, 3 insertions, 71 deletions
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 59490768..00000000 --- a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Tue, 23 May 2023 13:16:05 -0300 | ||
4 | Subject: [PATCH] ARM: imx_v7_defconfig: Remove KERNEL_LZO config | ||
5 | |||
6 | The KERNEL_GZIP is used in most config and is the default, there is no | ||
7 | clear reason to diverge so let default be used. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
12 | --- | ||
13 | arch/arm/configs/imx_v7_defconfig | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig | ||
17 | index 6de3049689191..94e9457e2bab1 100644 | ||
18 | --- a/arch/arm/configs/imx_v7_defconfig | ||
19 | +++ b/arch/arm/configs/imx_v7_defconfig | ||
20 | @@ -1,4 +1,3 @@ | ||
21 | -CONFIG_KERNEL_LZO=y | ||
22 | CONFIG_SYSVIPC=y | ||
23 | CONFIG_POSIX_MQUEUE=y | ||
24 | CONFIG_NO_HZ=y | ||
25 | -- | ||
26 | 2.40.1 | ||
27 | |||
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 a917a243..00000000 --- a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 168e36d8879e3f5c4cf57ed74c10f6c134e45638 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@foundries.io> | ||
3 | Date: Tue, 25 Jul 2023 10:54:45 -0300 | ||
4 | Subject: [PATCH] drivers:mxc-gpu-viv: Fix enum-int-mismatch warning | ||
5 | |||
6 | Fix the warning (treated as error): | ||
7 | |||
8 | ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] | ||
9 | | 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) | ||
10 | | | ^~~~~~~~~~~~ | ||
11 | | 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: | ||
12 | | /(...)/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 *)'} | ||
13 | | 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); | ||
14 | | | ^~~~~~~~~~~~ | ||
15 | | cc1: all warnings being treated as errors | ||
16 | |||
17 | Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io> | ||
18 | --- | ||
19 | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | 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 | ||
23 | index 61edf03571443..b4c1cbf414846 100644 | ||
24 | --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | ||
25 | +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | ||
26 | @@ -337,7 +337,7 @@ _ConvertLogical2Physical(IN gckOS Os, | ||
27 | IN PLINUX_MDL Mdl, | ||
28 | OUT gctPHYS_ADDR_T *Physical); | ||
29 | |||
30 | -gctBOOL | ||
31 | +gceSTATUS | ||
32 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal); | ||
33 | |||
34 | static inline gctINT | ||
35 | -- | ||
36 | 2.34.1 | ||
37 | |||
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index 574ba04d..f8a9ce1d 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 | |||
12 | 12 | ||
13 | require recipes-kernel/linux/linux-imx.inc | 13 | require recipes-kernel/linux/linux-imx.inc |
14 | 14 | ||
15 | SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \ | ||
16 | file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \ | ||
17 | " | ||
18 | |||
19 | SRCBRANCH = "lf-6.1.y" | 15 | SRCBRANCH = "lf-6.1.y" |
20 | LOCALVERSION = "-6.1.22-2.0.0" | 16 | LOCALVERSION = "-6.1.36-2.1.0" |
21 | SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67" | 17 | SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" |
22 | 18 | ||
23 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 19 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
24 | # required by kernel-yocto.bbclass. | 20 | # required by kernel-yocto.bbclass. |
25 | # | 21 | # |
26 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 22 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
27 | # should be updated once patchlevel is merged. | 23 | # should be updated once patchlevel is merged. |
28 | LINUX_VERSION = "6.1.22" | 24 | LINUX_VERSION = "6.1.36" |
29 | 25 | ||
30 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 26 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
31 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 27 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |