diff options
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.12.bb | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_6.1.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_6.6.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_6.12.bb | 8 |
4 files changed, 14 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.12.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb index 8d680ff0..ef87e814 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.12.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb | |||
@@ -42,7 +42,10 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
42 | # conflicts, prioritizing NXP BSP source code as the latest vendor updates. | 42 | # conflicts, prioritizing NXP BSP source code as the latest vendor updates. |
43 | # Additional commits may exist to better acommodate yocto builds. | 43 | # Additional commits may exist to better acommodate yocto builds. |
44 | # | 44 | # |
45 | # $ git log --oneline --no-merges v6.12.3.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y | 45 | # $ git log --oneline --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y |
46 | # - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency" | ||
47 | # - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL" | ||
48 | # - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins | ||
46 | # - 29efe53139ac hwrng: optee: support generic crypto | 49 | # - 29efe53139ac hwrng: optee: support generic crypto |
47 | # - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states | 50 | # - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states |
48 | # - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST | 51 | # - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST |
@@ -68,14 +71,14 @@ require linux-imx.inc | |||
68 | 71 | ||
69 | KBRANCH = "6.12-1.0.x-imx" | 72 | KBRANCH = "6.12-1.0.x-imx" |
70 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 73 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
71 | SRCREV = "29efe53139acb64d96bfcc119cd10d10c552801b" | 74 | SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1" |
72 | 75 | ||
73 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 76 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
74 | # required by kernel-yocto.bbclass. | 77 | # required by kernel-yocto.bbclass. |
75 | # | 78 | # |
76 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 79 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
77 | # should be updated once patchlevel is merged. | 80 | # should be updated once patchlevel is merged. |
78 | LINUX_VERSION = "6.12.3" | 81 | LINUX_VERSION = "6.12.34" |
79 | 82 | ||
80 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 83 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
81 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 84 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb index 8e1bab4b..ae1e71b1 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb | |||
@@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= | |||
21 | # | 21 | # |
22 | # 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 |
23 | # should be updated once patchlevel is merged. | 23 | # should be updated once patchlevel is merged. |
24 | LINUX_VERSION = "6.1.72" | 24 | LINUX_VERSION = "6.1.111" |
25 | 25 | ||
26 | KBRANCH = "6.1.x+fslc" | 26 | KBRANCH = "6.1.x+fslc" |
27 | SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" | 27 | SRCREV = "195925841506cd58552d73ebabadd08d6016e4c6" |
28 | 28 | ||
29 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 29 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
30 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 30 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb index a8c91cdb..cc067262 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.6.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb | |||
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= | |||
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 = "6.6.50" | 22 | LINUX_VERSION = "6.6.52" |
23 | 23 | ||
24 | KBRANCH = "6.6.x+fslc" | 24 | KBRANCH = "6.6.x+fslc" |
25 | SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699" | 25 | SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986" |
26 | 26 | ||
27 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 27 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" | 28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-fslc_6.12.bb b/recipes-kernel/linux/linux-fslc_6.12.bb index 7902b753..8b66b82d 100644 --- a/recipes-kernel/linux/linux-fslc_6.12.bb +++ b/recipes-kernel/linux/linux-fslc_6.12.bb | |||
@@ -24,12 +24,12 @@ DEPENDS += " \ | |||
24 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 24 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
25 | # should be updated once patchlevel is merged. | 25 | # should be updated once patchlevel is merged. |
26 | # | 26 | # |
27 | # Linux kernel stable 6.12.28 changelog: | 27 | # Linux kernel stable 6.12.34 changelog: |
28 | # https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.28 | 28 | # https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34 |
29 | LINUX_VERSION = "6.12.28" | 29 | LINUX_VERSION = "6.12.34" |
30 | 30 | ||
31 | KBRANCH = "6.12.x+fslc" | 31 | KBRANCH = "6.12.x+fslc" |
32 | SRCREV = "7a7717289cd3915e484b02c02557de380352b030" | 32 | SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30" |
33 | 33 | ||
34 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 34 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
35 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" | 35 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" |