diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2021-06-30 17:47:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 17:47:22 -0300 |
| commit | b656c6499a452bd3040bed71f9188a7f09f464ad (patch) | |
| tree | 7b2740c7905609b97b58273af0217431ad5770e0 | |
| parent | fca23689211cb8d00d2f00f621e99cff8ea1c4b2 (diff) | |
| parent | a1ff57baf4cfee1decf209aa8da4378ac4d16ca0 (diff) | |
| download | meta-freescale-b656c6499a452bd3040bed71f9188a7f09f464ad.tar.gz | |
Merge pull request #820 from zandrey/kernel-upgrade-master
Consolidated Kernel update (v5.4.129 + v5.10.47 + 5.12.14)
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 8 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_5.10.bb | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-fslc_5.12.bb | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index b2d9ea9b6..d3ed56ca9 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.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.4.126 | 31 | # tag: v5.4.129 |
| 32 | # | 32 | # |
| 33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
| 34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
| @@ -71,17 +71,17 @@ LICENSE = "GPLv2" | |||
| 71 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 71 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
| 72 | 72 | ||
| 73 | KBRANCH = "5.4-2.3.x-imx" | 73 | KBRANCH = "5.4-2.3.x-imx" |
| 74 | SRCREV = "a402819056e695056c43981ca9acf520b6b00c84" | 74 | SRCREV = "05c302bdd5fe7eb75c22eeb4ab2b669d4849a9df" |
| 75 | 75 | ||
| 76 | # 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 |
| 77 | # required by kernel-yocto.bbclass. | 77 | # required by kernel-yocto.bbclass. |
| 78 | # | 78 | # |
| 79 | # 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 |
| 80 | # should be updated once patchlevel is merged. | 80 | # should be updated once patchlevel is merged. |
| 81 | LINUX_VERSION = "5.4.126" | 81 | LINUX_VERSION = "5.4.129" |
| 82 | 82 | ||
| 83 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 83 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
| 84 | LOCALVERSION = "-imx-5.4.70-2.3.0" | 84 | LOCALVERSION = "-5.4.70-2.3.0" |
| 85 | 85 | ||
| 86 | DEFAULT_PREFERENCE = "1" | 86 | DEFAULT_PREFERENCE = "1" |
| 87 | 87 | ||
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb index 682a487e2..bd601ed21 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.44" | 22 | LINUX_VERSION = "5.10.47" |
| 23 | 23 | ||
| 24 | KBRANCH = "5.10.x+fslc" | 24 | KBRANCH = "5.10.x+fslc" |
| 25 | SRCREV = "1d2f89fc03e31e2eae35d0babc5d289f2ce91d68" | 25 | SRCREV = "03eb3893e83beaee3a83b119cd9f2a3001573012" |
| 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_5.12.bb b/recipes-kernel/linux/linux-fslc_5.12.bb index 18bb46c3b..e8b77f614 100644 --- a/recipes-kernel/linux/linux-fslc_5.12.bb +++ b/recipes-kernel/linux/linux-fslc_5.12.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.12.11" | 22 | LINUX_VERSION = "5.12.14" |
| 23 | 23 | ||
| 24 | KBRANCH = "5.12.x+fslc" | 24 | KBRANCH = "5.12.x+fslc" |
| 25 | SRCREV = "55f71ca4e7196e3c667c720b55d4fd1117d0a051" | 25 | SRCREV = "2f4aa90810432316f74d4ebfc4c92b959622184c" |
| 26 | 26 | ||
| 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |
