diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.10.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_5.10.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-mfgtool_5.15.bb (renamed from recipes-kernel/linux/linux-fslc-mfgtool_5.14.bb) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/armv8a/defconfig | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_5.15.bb (renamed from recipes-kernel/linux/linux-fslc_5.14.bb) | 6 |
6 files changed, 11 insertions, 10 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb index 799cf4e5..c8a513f4 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.10.bb | |||
@@ -28,7 +28,7 @@ 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.10.74 | 31 | # tag: v5.10.79 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
@@ -69,14 +69,14 @@ LICENSE = "GPLv2" | |||
69 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 69 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
70 | 70 | ||
71 | KBRANCH = "5.10-2.1.x-imx" | 71 | KBRANCH = "5.10-2.1.x-imx" |
72 | SRCREV = "b0d74a58e223ab3e125a170c48bc1904d5a656ed" | 72 | SRCREV = "cdf10f101ab7e0112a285ab86e1a62d80e7d2104" |
73 | 73 | ||
74 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 74 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
75 | # required by kernel-yocto.bbclass. | 75 | # required by kernel-yocto.bbclass. |
76 | # | 76 | # |
77 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 77 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
78 | # should be updated once patchlevel is merged. | 78 | # should be updated once patchlevel is merged. |
79 | LINUX_VERSION = "5.10.74" | 79 | LINUX_VERSION = "5.10.79" |
80 | 80 | ||
81 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 81 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
82 | LOCALVERSION = "-5.10.52-2.1.0" | 82 | LOCALVERSION = "-5.10.52-2.1.0" |
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb index 15b48551..b56e003f 100644 --- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb +++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb | |||
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
19 | # | 19 | # |
20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
21 | # should be updated once patchlevel is merged. | 21 | # should be updated once patchlevel is merged. |
22 | LINUX_VERSION = "5.10.74" | 22 | LINUX_VERSION = "5.10.79" |
23 | 23 | ||
24 | KBRANCH = "5.10.x+fslc" | 24 | KBRANCH = "5.10.x+fslc" |
25 | SRCREV = "4cdb72cdd5cd1d00b4045f55331a94b3f0f73ca1" | 25 | SRCREV = "0ac3cc275e5453959661bfbbc78b22c2dc6d1987" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |
diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.14.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.15.bb index 09d35c91..09d35c91 100644 --- a/recipes-kernel/linux/linux-fslc-mfgtool_5.14.bb +++ b/recipes-kernel/linux/linux-fslc-mfgtool_5.15.bb | |||
diff --git a/recipes-kernel/linux/linux-fslc/armv8a/defconfig b/recipes-kernel/linux/linux-fslc/armv8a/defconfig index 65a142a3..198f7e4c 100644 --- a/recipes-kernel/linux/linux-fslc/armv8a/defconfig +++ b/recipes-kernel/linux/linux-fslc/armv8a/defconfig | |||
@@ -246,7 +246,6 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
246 | CONFIG_FW_LOADER_USER_HELPER=y | 246 | CONFIG_FW_LOADER_USER_HELPER=y |
247 | CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y | 247 | CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y |
248 | CONFIG_HISILICON_LPC=y | 248 | CONFIG_HISILICON_LPC=y |
249 | CONFIG_SIMPLE_PM_BUS=y | ||
250 | CONFIG_FSL_MC_BUS=y | 249 | CONFIG_FSL_MC_BUS=y |
251 | CONFIG_TEGRA_ACONNECT=m | 250 | CONFIG_TEGRA_ACONNECT=m |
252 | CONFIG_GNSS=m | 251 | CONFIG_GNSS=m |
@@ -974,6 +973,7 @@ CONFIG_TI_SCI_CLK=y | |||
974 | CONFIG_COMMON_CLK_QCOM=y | 973 | CONFIG_COMMON_CLK_QCOM=y |
975 | CONFIG_QCOM_A53PLL=y | 974 | CONFIG_QCOM_A53PLL=y |
976 | CONFIG_QCOM_CLK_APCS_MSM8916=y | 975 | CONFIG_QCOM_CLK_APCS_MSM8916=y |
976 | CONFIG_QCOM_CLK_APCC_MSM8996=y | ||
977 | CONFIG_QCOM_CLK_SMD_RPM=y | 977 | CONFIG_QCOM_CLK_SMD_RPM=y |
978 | CONFIG_QCOM_CLK_RPMH=y | 978 | CONFIG_QCOM_CLK_RPMH=y |
979 | CONFIG_IPQ_GCC_8074=y | 979 | CONFIG_IPQ_GCC_8074=y |
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 2ab6b937..7078f912 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -120,7 +120,6 @@ CONFIG_BLK_DEV_SD=y | |||
120 | CONFIG_SCSI_CONSTANTS=y | 120 | CONFIG_SCSI_CONSTANTS=y |
121 | CONFIG_SCSI_LOGGING=y | 121 | CONFIG_SCSI_LOGGING=y |
122 | CONFIG_SCSI_SCAN_ASYNC=y | 122 | CONFIG_SCSI_SCAN_ASYNC=y |
123 | # CONFIG_SCSI_LOWLEVEL is not set | ||
124 | CONFIG_ATA=y | 123 | CONFIG_ATA=y |
125 | CONFIG_SATA_AHCI_PLATFORM=y | 124 | CONFIG_SATA_AHCI_PLATFORM=y |
126 | CONFIG_AHCI_IMX=y | 125 | CONFIG_AHCI_IMX=y |
@@ -252,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y | |||
252 | CONFIG_REGULATOR_DA9062=y | 251 | CONFIG_REGULATOR_DA9062=y |
253 | CONFIG_REGULATOR_DA9063=y | 252 | CONFIG_REGULATOR_DA9063=y |
254 | CONFIG_REGULATOR_GPIO=y | 253 | CONFIG_REGULATOR_GPIO=y |
254 | CONFIG_REGULATOR_LTC3676=y | ||
255 | CONFIG_REGULATOR_MC13783=y | 255 | CONFIG_REGULATOR_MC13783=y |
256 | CONFIG_REGULATOR_MC13892=y | 256 | CONFIG_REGULATOR_MC13892=y |
257 | CONFIG_REGULATOR_PFUZE100=y | 257 | CONFIG_REGULATOR_PFUZE100=y |
@@ -291,6 +291,7 @@ CONFIG_DRM_IMX_LDB=y | |||
291 | CONFIG_DRM_IMX_HDMI=y | 291 | CONFIG_DRM_IMX_HDMI=y |
292 | CONFIG_DRM_ETNAVIV=y | 292 | CONFIG_DRM_ETNAVIV=y |
293 | CONFIG_DRM_MXSFB=y | 293 | CONFIG_DRM_MXSFB=y |
294 | CONFIG_FB=y | ||
294 | CONFIG_FB_MODE_HELPERS=y | 295 | CONFIG_FB_MODE_HELPERS=y |
295 | CONFIG_LCD_CLASS_DEVICE=y | 296 | CONFIG_LCD_CLASS_DEVICE=y |
296 | CONFIG_LCD_L4F00242T03=y | 297 | CONFIG_LCD_L4F00242T03=y |
diff --git a/recipes-kernel/linux/linux-fslc_5.14.bb b/recipes-kernel/linux/linux-fslc_5.15.bb index 82241cf1..f2e15981 100644 --- a/recipes-kernel/linux/linux-fslc_5.14.bb +++ b/recipes-kernel/linux/linux-fslc_5.15.bb | |||
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
19 | # | 19 | # |
20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
21 | # should be updated once patchlevel is merged. | 21 | # should be updated once patchlevel is merged. |
22 | LINUX_VERSION = "5.14.13" | 22 | LINUX_VERSION = "5.15.2" |
23 | 23 | ||
24 | KBRANCH = "5.14.x+fslc" | 24 | KBRANCH = "5.15.x+fslc" |
25 | SRCREV = "d0f83feee96a6dcc4ff3f431969fe7181bbb5080" | 25 | SRCREV = "3b7c3ba50480a1ee9043c3d07293c175c2e9d47b" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |