diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-10-15 09:03:06 -0300 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 09:03:06 -0300 | 
| commit | 5d63eb4a2585e3d4860b80f1936cf3170ee2c453 (patch) | |
| tree | 65265de4816942f09f3f25d1babb11dc2c550f23 | |
| parent | 7d7d4a46e64f9c4fa4f257ac0f670e23ba746520 (diff) | |
| parent | 942984619dbe39aa4273758b94166bd7d6e5dc54 (diff) | |
| download | meta-freescale-5d63eb4a2585e3d4860b80f1936cf3170ee2c453.tar.gz | |
Merge pull request #1266 from angolini/bump-kernel-2.1.0-v5.15.60
linux-fslc-imx: upgrade to lf-5.15.52-2.1.0 from NXP
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.15.bb | 14 | 
1 files changed, 6 insertions, 8 deletions
| diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb index 2db57df42..2c95222a1 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.15.bb | |||
| @@ -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.50 | 31 | # tag: v5.15.60 | 
| 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.32-2.0.0 | 36 | # tag: lf-5.15.52-2.1.0 | 
| 37 | # | 37 | # | 
| 38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ | 
| 39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) | 
| @@ -43,8 +43,6 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
| 43 | # 49c2d3b7964d gpio: fix enabling GPIO_VF610 | 43 | # 49c2d3b7964d gpio: fix enabling GPIO_VF610 | 
| 44 | # c04a396fcbf7 ARM: mach-imx: conditionally disable some functions from busfreq-imx | 44 | # c04a396fcbf7 ARM: mach-imx: conditionally disable some functions from busfreq-imx | 
| 45 | # 166a38557bf9 drm: bridge: it6161: add missing gpio consumer header | 45 | # 166a38557bf9 drm: bridge: it6161: add missing gpio consumer header | 
| 46 | # bc2e851e616a Revert "clk: imx: off by one in imx_lpcg_parse_clks_from_dt()" | ||
| 47 | # 27d3c1285087 Revert "drm/bridge: Add missing pm_runtime_put_sync" | ||
| 48 | # | 46 | # | 
| 49 | # NOTE to upgraders: | 47 | # NOTE to upgraders: | 
| 50 | # This recipe should NOT collect individual patches, they should be applied to | 48 | # This recipe should NOT collect individual patches, they should be applied to | 
| @@ -57,18 +55,18 @@ include linux-fslc.inc | |||
| 57 | LICENSE = "GPL-2.0-only" | 55 | LICENSE = "GPL-2.0-only" | 
| 58 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 56 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 
| 59 | 57 | ||
| 60 | KBRANCH = "5.15-2.0.x-imx" | 58 | KBRANCH = "5.15-2.1.x-imx" | 
| 61 | SRCREV = "845d53f13aac7d712b931a21df53bc8ccb22b31b" | 59 | SRCREV = "e1b43282a845dfb78e115a8e2dc4144ce0d335b5" | 
| 62 | 60 | ||
| 63 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 61 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 
| 64 | # required by kernel-yocto.bbclass. | 62 | # required by kernel-yocto.bbclass. | 
| 65 | # | 63 | # | 
| 66 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 64 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 
| 67 | # should be updated once patchlevel is merged. | 65 | # should be updated once patchlevel is merged. | 
| 68 | LINUX_VERSION = "5.15.67" | 66 | LINUX_VERSION = "5.15.60" | 
| 69 | 67 | ||
| 70 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 68 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 
| 71 | LOCALVERSION = "-5.15.60-2.0.0" | 69 | LOCALVERSION = "-5.15.60-2.1.0" | 
| 72 | 70 | ||
| 73 | DEFAULT_PREFERENCE = "1" | 71 | DEFAULT_PREFERENCE = "1" | 
| 74 | 72 | ||
