diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-09-20 14:29:11 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-20 14:29:11 -0300 |
commit | 64947ae93aca92e12a0db4fb787e2b4c7a5cee7d (patch) | |
tree | 1ae0946b89b0e5e25f045a40095c6b38571eedc5 | |
parent | 2cc62f47c745d1cff3e544c553a8cbfa750f18da (diff) | |
parent | 12d5b6c9e5d0d46a6e9f3909439934401dcbffa6 (diff) | |
download | meta-freescale-64947ae93aca92e12a0db4fb787e2b4c7a5cee7d.tar.gz |
Merge pull request #872 from zandrey/kernel-update-master
Consolidated Kernel update (v5.4.147 + v5.10.67 + 5.14.6)
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts_5.10.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_5.14.bb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index b7a5cd82..83621e1b 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.134 | 31 | # tag: v5.4.147 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
@@ -86,14 +86,14 @@ LICENSE = "GPLv2" | |||
86 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 86 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
87 | 87 | ||
88 | KBRANCH = "5.4-2.3.x-imx" | 88 | KBRANCH = "5.4-2.3.x-imx" |
89 | SRCREV = "e3b082933caab27829e775606708381fe1b7c3ba" | 89 | SRCREV = "aad410850445424f566e57a419527b6e2d3ab42d" |
90 | 90 | ||
91 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 91 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
92 | # required by kernel-yocto.bbclass. | 92 | # required by kernel-yocto.bbclass. |
93 | # | 93 | # |
94 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 94 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
95 | # should be updated once patchlevel is merged. | 95 | # should be updated once patchlevel is merged. |
96 | LINUX_VERSION = "5.4.134" | 96 | LINUX_VERSION = "5.4.147" |
97 | 97 | ||
98 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 98 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
99 | LOCALVERSION = "-5.4.70-2.3.0" | 99 | LOCALVERSION = "-5.4.70-2.3.0" |
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb index 6af937a7..fee8859f 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.52" | 22 | LINUX_VERSION = "5.10.67" |
23 | 23 | ||
24 | KBRANCH = "5.10.x+fslc" | 24 | KBRANCH = "5.10.x+fslc" |
25 | SRCREV = "cb67a3e29a88e06e2891f8e2aac289305d8f08ff" | 25 | SRCREV = "5d6224bd7e38de87fa7dcef0046e6f7377d68660" |
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.14.bb b/recipes-kernel/linux/linux-fslc_5.14.bb index 87067c88..f67c1b7b 100644 --- a/recipes-kernel/linux/linux-fslc_5.14.bb +++ b/recipes-kernel/linux/linux-fslc_5.14.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.3" | 22 | LINUX_VERSION = "5.14.6" |
23 | 23 | ||
24 | KBRANCH = "5.14.x+fslc" | 24 | KBRANCH = "5.14.x+fslc" |
25 | SRCREV = "4b88a1ee28e7be1fce90e389d786575408924d65" | 25 | SRCREV = "79bcc3a5a2e73ad1024c63fd0e7c368652e48145" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |