diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-28 20:11:31 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-08-28 18:31:54 -0300 |
commit | 34131f21de826030d6fe3af4f25fb291a4b0fdb4 (patch) | |
tree | 073805723b1d2b28782398c0a177dc220af7dc78 | |
parent | 4be21cf9158ce892b8c2383d04290e72dc0ef555 (diff) | |
download | meta-freescale-34131f21de826030d6fe3af4f25fb291a4b0fdb4.tar.gz |
linux-fslc-imx: update to v5.4.61 + fix perf build
Kernel repository has been upgraded upto and including v5.4.55 tag from
korg. Tracking information is updated with the new stable tag.
Additional missing tracking entries are also added, which were missing
from one of previous merge - not the tracking list contains all
cherry-picked entries integrated into this tree.
This revision also contains following cherry-pick(s) from upstream:
- 19be176e9eed perf cs-etm: Move definition of 'traceid_list' global variable from header file
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index b0c8612a..0477d74a 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.58 | 31 | # tag: v5.4.61 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
@@ -44,7 +44,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
44 | # ------------------------------------------------------------------------------ | 44 | # ------------------------------------------------------------------------------ |
45 | # 3. Critical patches (SHA(s)) | 45 | # 3. Critical patches (SHA(s)) |
46 | # ------------------------------------------------------------------------------ | 46 | # ------------------------------------------------------------------------------ |
47 | # 19be176e9eed perf cs-etm: Move definition of 'traceid_list' global variable from header file | ||
47 | # d40fb1b86571 libtraceevent: Fix build with binutils 2.35 | 48 | # d40fb1b86571 libtraceevent: Fix build with binutils 2.35 |
49 | # 0296957500a0 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL | ||
50 | # 804e520787f3 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX | ||
51 | # 0c01f815c1b4 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 | ||
52 | # 691712e2b671 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ | ||
48 | # 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation | 53 | # 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation |
49 | # f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes | 54 | # f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes |
50 | # 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' | 55 | # 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' |
@@ -70,14 +75,14 @@ LICENSE = "GPLv2" | |||
70 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 75 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
71 | 76 | ||
72 | SRCBRANCH = "5.4-1.0.0-imx" | 77 | SRCBRANCH = "5.4-1.0.0-imx" |
73 | SRCREV = "74731e66e7ec52db4e5fe956c288f3ec8353a671" | 78 | SRCREV = "cd91bed8782ac945568ae453b538a69bfdb0b247" |
74 | 79 | ||
75 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 80 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
76 | # required by kernel-yocto.bbclass. | 81 | # required by kernel-yocto.bbclass. |
77 | # | 82 | # |
78 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 83 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
79 | # should be updated once patchlevel is merged. | 84 | # should be updated once patchlevel is merged. |
80 | LINUX_VERSION = "5.4.58" | 85 | LINUX_VERSION = "5.4.61" |
81 | 86 | ||
82 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 87 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
83 | LOCALVERSION = "-lf-5.4.y" | 88 | LOCALVERSION = "-lf-5.4.y" |