diff options
author | Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | 2023-04-18 23:15:54 +0300 |
---|---|---|
committer | Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | 2023-04-19 17:12:54 +0300 |
commit | 4e135f3a45df1e10839b9058b17315792e60a644 (patch) | |
tree | 7aaaac129447d7b3944aee0b6f4327c3fc9d215d /recipes-kernel | |
parent | 01289ae67b57a60a18dcd3bc51e1240740228578 (diff) | |
download | meta-freescale-4e135f3a45df1e10839b9058b17315792e60a644.tar.gz |
linux-fslc-imx: Upgrade to 6.1-1.0.x-imx
Upgrade the kernel to 6.1-1.0.x-imx based on NXP lf-6.1.y and
mainline stable linux-6.1.y.
Stable version: 6.1.24
Actualize defconfig.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb (renamed from recipes-kernel/linux/linux-fslc-imx_5.15.bb) | 16 |
3 files changed, 18 insertions, 16 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig index 1ef259ee..2afe735a 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig | |||
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y | |||
545 | CONFIG_MEDIA_USB_SUPPORT=y | 545 | CONFIG_MEDIA_USB_SUPPORT=y |
546 | CONFIG_USB_VIDEO_CLASS=m | 546 | CONFIG_USB_VIDEO_CLASS=m |
547 | CONFIG_V4L_PLATFORM_DRIVERS=y | 547 | CONFIG_V4L_PLATFORM_DRIVERS=y |
548 | CONFIG_VIDEO_MXC_CAPTURE=y | 548 | CONFIG_VIDEO_MXC_CAPTURE=m |
549 | CONFIG_VIDEO_MX8_CAPTURE=y | 549 | CONFIG_VIDEO_MX8_CAPTURE=y |
550 | CONFIG_VIDEO_MXC_CSI_CAMERA=y | 550 | CONFIG_VIDEO_MXC_CSI_CAMERA=m |
551 | CONFIG_MXC_MIPI_CSI=y | 551 | CONFIG_MXC_MIPI_CSI=m |
552 | CONFIG_DWC_MIPI_CSI2_HOST=y | 552 | CONFIG_DWC_MIPI_CSI2_HOST=y |
553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y | 553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m |
554 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 554 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
555 | CONFIG_VIDEO_IMX8_JPEG=m | 555 | CONFIG_VIDEO_IMX8_JPEG=m |
556 | CONFIG_VIDEO_AMPHION_VPU=y | 556 | CONFIG_VIDEO_AMPHION_VPU=y |
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y | |||
856 | CONFIG_VIDEO_HANTRO=m | 856 | CONFIG_VIDEO_HANTRO=m |
857 | CONFIG_VIDEO_IMX_CAPTURE=y | 857 | CONFIG_VIDEO_IMX_CAPTURE=y |
858 | CONFIG_IMX8_MEDIA_DEVICE=m | 858 | CONFIG_IMX8_MEDIA_DEVICE=m |
859 | CONFIG_IMX8_MIPI_CSI2_YAV=m | ||
859 | CONFIG_MHDP_HDMIRX=y | 860 | CONFIG_MHDP_HDMIRX=y |
860 | CONFIG_MHDP_HDMIRX_CEC=y | 861 | CONFIG_MHDP_HDMIRX_CEC=y |
861 | CONFIG_FSL_DPAA2=y | 862 | CONFIG_FSL_DPAA2=y |
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig index 1ef259ee..2afe735a 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig | |||
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y | |||
545 | CONFIG_MEDIA_USB_SUPPORT=y | 545 | CONFIG_MEDIA_USB_SUPPORT=y |
546 | CONFIG_USB_VIDEO_CLASS=m | 546 | CONFIG_USB_VIDEO_CLASS=m |
547 | CONFIG_V4L_PLATFORM_DRIVERS=y | 547 | CONFIG_V4L_PLATFORM_DRIVERS=y |
548 | CONFIG_VIDEO_MXC_CAPTURE=y | 548 | CONFIG_VIDEO_MXC_CAPTURE=m |
549 | CONFIG_VIDEO_MX8_CAPTURE=y | 549 | CONFIG_VIDEO_MX8_CAPTURE=y |
550 | CONFIG_VIDEO_MXC_CSI_CAMERA=y | 550 | CONFIG_VIDEO_MXC_CSI_CAMERA=m |
551 | CONFIG_MXC_MIPI_CSI=y | 551 | CONFIG_MXC_MIPI_CSI=m |
552 | CONFIG_DWC_MIPI_CSI2_HOST=y | 552 | CONFIG_DWC_MIPI_CSI2_HOST=y |
553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y | 553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m |
554 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 554 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
555 | CONFIG_VIDEO_IMX8_JPEG=m | 555 | CONFIG_VIDEO_IMX8_JPEG=m |
556 | CONFIG_VIDEO_AMPHION_VPU=y | 556 | CONFIG_VIDEO_AMPHION_VPU=y |
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y | |||
856 | CONFIG_VIDEO_HANTRO=m | 856 | CONFIG_VIDEO_HANTRO=m |
857 | CONFIG_VIDEO_IMX_CAPTURE=y | 857 | CONFIG_VIDEO_IMX_CAPTURE=y |
858 | CONFIG_IMX8_MEDIA_DEVICE=m | 858 | CONFIG_IMX8_MEDIA_DEVICE=m |
859 | CONFIG_IMX8_MIPI_CSI2_YAV=m | ||
859 | CONFIG_MHDP_HDMIRX=y | 860 | CONFIG_MHDP_HDMIRX=y |
860 | CONFIG_MHDP_HDMIRX_CEC=y | 861 | CONFIG_MHDP_HDMIRX_CEC=y |
861 | CONFIG_FSL_DPAA2=y | 862 | CONFIG_FSL_DPAA2=y |
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index bddac40c..8e8b5424 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb | |||
@@ -12,8 +12,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
12 | ############################################################################### | 12 | ############################################################################### |
13 | # This recipe (and corresponding kernel repository and branch) receives updates | 13 | # This recipe (and corresponding kernel repository and branch) receives updates |
14 | # from 3 different sources: | 14 | # from 3 different sources: |
15 | # 1. Stable [linux-5.15.y] branch updates of korg; | 15 | # 1. Stable [linux-6.1.y] branch updates of korg; |
16 | # 2. NXP-specific updates via branch [5.10-2.1.x-imx] shared via CodeAurora forum; | 16 | # 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; |
17 | # 3. Critical patches, which are not (yet) integrated into either of 2 above | 17 | # 3. Critical patches, which are not (yet) integrated into either of 2 above |
18 | # sources, but are required to be applied to the kernel tree. | 18 | # sources, but are required to be applied to the kernel tree. |
19 | # | 19 | # |
@@ -28,12 +28,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
28 | # ------------------------------------------------------------------------------ | 28 | # ------------------------------------------------------------------------------ |
29 | # 1. Stable (tag or SHA(s)) | 29 | # 1. Stable (tag or SHA(s)) |
30 | # ------------------------------------------------------------------------------ | 30 | # ------------------------------------------------------------------------------ |
31 | # tag: v5.15.87 | 31 | # tag: v6.1.24 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
35 | # ------------------------------------------------------------------------------ | 35 | # ------------------------------------------------------------------------------ |
36 | # tag: lf-5.15.71-2.2.0 | 36 | # tag: lf-6.1.1-1.0.0 |
37 | # | 37 | # |
38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
@@ -50,18 +50,18 @@ include linux-fslc.inc | |||
50 | LICENSE = "GPL-2.0-only" | 50 | LICENSE = "GPL-2.0-only" |
51 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 51 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
52 | 52 | ||
53 | KBRANCH = "5.15-2.2.x-imx" | 53 | KBRANCH = "6.1-1.0.x-imx" |
54 | SRCREV = "0eb4504bd3b8fd125e83ec62da9ba039519f96c8" | 54 | SRCREV = "897d73a656fe33d0c4549c5de1d07797f99d6871" |
55 | 55 | ||
56 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 56 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
57 | # required by kernel-yocto.bbclass. | 57 | # required by kernel-yocto.bbclass. |
58 | # | 58 | # |
59 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 59 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
60 | # should be updated once patchlevel is merged. | 60 | # should be updated once patchlevel is merged. |
61 | LINUX_VERSION = "5.15.87" | 61 | LINUX_VERSION = "6.1.24" |
62 | 62 | ||
63 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 63 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
64 | LOCALVERSION = "-5.15.87-2.2.0" | 64 | LOCALVERSION = "-6.1.24-1.0.0" |
65 | 65 | ||
66 | DEFAULT_PREFERENCE = "1" | 66 | DEFAULT_PREFERENCE = "1" |
67 | 67 | ||