diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-01-12 14:28:47 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-12 14:28:47 -0300 |
commit | e3611512ff8c28b1418d032a03184a198e8e886e (patch) | |
tree | 03baac4c7263ad2f75da6f6e8dc0685dcc6e5e33 | |
parent | f6f303e32bd18131736f1edee2685ca92584a230 (diff) | |
parent | 9d353d77107daea6e397a0a913a5ffe62fb5aed1 (diff) | |
download | meta-freescale-e3611512ff8c28b1418d032a03184a198e8e886e.tar.gz |
Merge pull request #1385 from angolini/2.2.0-bump-linux
linux-fslc-imx: upgrade to lf-5.15.71-2.2.0 from NXP and v5.15.87 fro…
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.15.bb | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb index 933b7b1b..7d23198b 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.15.bb | |||
@@ -28,30 +28,16 @@ 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.86 | 31 | # tag: v5.15.87 |
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.52-2.1.0 | 36 | # tag: lf-5.15.71-2.2.0 |
37 | # | 37 | # |
38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
40 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
41 | # beacf1c5267a fec_uio: fix implicit declaration | ||
42 | # e8093f50522f cert host tools: Stop complaining about deprecated OpenSSL functions | ||
43 | # 49c2d3b7964d gpio: fix enabling GPIO_VF610 | ||
44 | # c04a396fcbf7 ARM: mach-imx: conditionally disable some functions from busfreq-imx | ||
45 | # 166a38557bf9 drm: bridge: it6161: add missing gpio consumer header | ||
46 | # 5abdee26320f Revert "ASoC: imx-card: Fix DSD/PDM mclk frequency" | ||
47 | # 6da679049e7f Revert "LF-5445: media: imx-jpeg: Add pm-sleep support for imx-jpeg" | ||
48 | # a62c5aa0d000 Revert "media: imx-jpeg: Don't clear stop state in handling dynamic resolution change" | ||
49 | # b54e0195c2e3 Revert "LF-6878: LF-6654: media: imx-jpeg: Implement g_selection and s_selection" | ||
50 | # 21f50ad28213 Revert "LF-6493: media: imx-jpeg: Add a timeout mechanism for each frame" | ||
51 | # 44970f9fbed6 Revert "media: imx-jpeg: Align upwards buffer size" | ||
52 | # ee7468eafdaa Revert "LF-6878: LF-6658: media: imx-jpeg: Support contiguous and non contiguous format" | ||
53 | # bb6e70bff1b7 drivers/soc/imx/gpcv2.c: complete patch revert | ||
54 | # a682d463667a Revert "serial: fsl_lpuart: Reset prior to registration" | ||
55 | # | 41 | # |
56 | # NOTE to upgraders: | 42 | # NOTE to upgraders: |
57 | # This recipe should NOT collect individual patches, they should be applied to | 43 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -64,18 +50,18 @@ include linux-fslc.inc | |||
64 | LICENSE = "GPL-2.0-only" | 50 | LICENSE = "GPL-2.0-only" |
65 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 51 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
66 | 52 | ||
67 | KBRANCH = "5.15-2.1.x-imx" | 53 | KBRANCH = "5.15-2.2.x-imx" |
68 | SRCREV = "7f663d3247e310835206336a4d1f49659094ef3f" | 54 | SRCREV = "3ff5eb3ff57e665c47c072284d7f624e5452b85d" |
69 | 55 | ||
70 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 56 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
71 | # required by kernel-yocto.bbclass. | 57 | # required by kernel-yocto.bbclass. |
72 | # | 58 | # |
73 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 59 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
74 | # should be updated once patchlevel is merged. | 60 | # should be updated once patchlevel is merged. |
75 | LINUX_VERSION = "5.15.86" | 61 | LINUX_VERSION = "5.15.87" |
76 | 62 | ||
77 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 63 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
78 | LOCALVERSION = "-5.15.86-2.1.0" | 64 | LOCALVERSION = "-5.15.87-2.2.0" |
79 | 65 | ||
80 | DEFAULT_PREFERENCE = "1" | 66 | DEFAULT_PREFERENCE = "1" |
81 | 67 | ||