diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-01-27 10:13:42 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-02-01 11:24:43 -0300 |
commit | 965fc16a455ee317ce359fd65132696b8d8b0b68 (patch) | |
tree | cd6ed00e30b7250f848956d679b32775f62ba936 /recipes-kernel/linux/linux-fslc-imx_5.4.bb | |
parent | 8c3a82ba6049dd94b22cc169ed5e99da90d0b561 (diff) | |
download | meta-freescale-965fc16a455ee317ce359fd65132696b8d8b0b68.tar.gz |
linux-fslc-imx: upgrade to rel_imx_5.4.70_2.3.0 from NXP
Kernel repository has a new branch introduced, which is based on NXP
release 5.4.70-2.3.0 and has latest stable patchlevel applied to it.
Current version of up-merged kernel is 5.4.92.
Update kernel recipe to include new kernel version and align kernel
config files based on following NXP configurations:
- imx_v8_defconfig used for i.MX8 family
- i.MX6/7 families kernel config file did not require any additional sync,
it matches to the imx_v7_defconfig
Tracking information in recipe is updated to include new branch, tag and
cherry-picks from NXP branch, together with patches applied from various
sources.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'recipes-kernel/linux/linux-fslc-imx_5.4.bb')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index 535b41b9..193c5d1b 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb | |||
@@ -33,39 +33,31 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
35 | # ------------------------------------------------------------------------------ | 35 | # ------------------------------------------------------------------------------ |
36 | # tag: rel_imx_5.4.47_2.2.0 | 36 | # tag: rel_imx_5.4.70_2.3.0 |
37 | # | ||
38 | # 5ec03d06f54e MLK-24836 ARM: imx: Refresh wdog should consider the CMD mode on i.MX7ULP | ||
39 | # bba6ff64f0df MLK-24824-3 ARM: imx: Refresh wdog1 to make sure it is NOT timeout before disabled | ||
40 | # bad81140da7c MLK-24828 ARM: imx: Add revision support for i.MX7ULP rev 2.2 | ||
41 | # 99fb4d4619ff MLK-24824-2 watchdog: imx7ulp: Move suspend/resume to noirq phase | ||
42 | # 8c8859e1c5b5 MLK-24824-1 watchdog: imx7ulp: Strictly follow the sequence for wdog operations | ||
43 | # | 37 | # |
44 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
45 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
46 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
47 | # 7642303e41c1 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set | 41 | # b598b85172f7 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set |
48 | # b3d088d2f8fa fbdev: fix fbinfo flag dropped upstream | 42 | # 845099bfd0b8 fbdev: fix fbinfo flag dropped upstream |
49 | # c874333fa0be arm64: dts: imx8mp: Add fallback compatible to ocotp node | 43 | # 847bfb09bb3b arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs |
50 | # 55abb34c9faf arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs | 44 | # d7ca6973c6d4 arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp |
51 | # df1f59fb613e arm64: dts: imx8mn: Use "fsl,imx8mm-ocotp" as ocotp's fallback compatible | 45 | # 539d19f12066 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL |
52 | # 7ad2a7f3fd6f arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp | 46 | # 169b71ce3f8a arm: imx: do not include smp_wfe_imx6.S for i.MX6SX |
53 | # 129a6fad43b8 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL | 47 | # 60be4c625594 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 |
54 | # e85ce3157725 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX | 48 | # f393781fa575 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ |
55 | # 4f49200132e6 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 | 49 | # e0e74faf6af4 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation |
56 | # 5d229c51b5a5 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ | 50 | # ad24781aecc3 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes |
57 | # 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation | 51 | # d56aa09ed0e0 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' |
58 | # f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes | 52 | # 923bc9e57b24 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S' |
59 | # 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' | 53 | # f952a6404d10 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file |
60 | # d4b105f930e2 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S' | 54 | # 1fdb6565a632 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411 |
61 | # e778467f65d0 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file | 55 | # 4fb833f01c30 ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file |
62 | # 8b39f5e53831 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411 | 56 | # 54c975dabcde ARM: imx: Fix boot crash if ocotp is not found |
63 | # 3bee262233eb ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file | 57 | # 1041cd02b33c ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs |
64 | # 40a6a98b3f38 ARM: imx: Fix boot crash if ocotp is not found | 58 | # 974b100d789c soc: imx-scu: Using existing serial_number instead of UID |
65 | # 8aad5031be00 ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs | 59 | # 6fbfed9afe99 soc: imx8: Using existing serial_number instead of UID |
66 | # 564409aa3b33 soc: imx-scu: Using existing serial_number instead of UID | 60 | # 64d8ea803af5 ARM: imx: Add serial number support for i.MX6/7 SoCs |
67 | # 0ee8e005bbfc soc: imx8: Using existing serial_number instead of UID | ||
68 | # 134cbb845fc7 ARM: imx: Add serial number support for i.MX6/7 SoCs | ||
69 | # | 61 | # |
70 | # NOTE to upgraders: | 62 | # NOTE to upgraders: |
71 | # This recipe should NOT collect individual patches, they should be applied to | 63 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -78,8 +70,8 @@ include linux-fslc.inc | |||
78 | LICENSE = "GPLv2" | 70 | LICENSE = "GPLv2" |
79 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 71 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
80 | 72 | ||
81 | SRCBRANCH = "5.4-2.2.x-imx" | 73 | SRCBRANCH = "5.4-2.3.x-imx" |
82 | SRCREV = "9335a2fd4a7f8f789838c5198ca6da5944c44fa5" | 74 | SRCREV = "2d26ac7ea809b04c354b4ea966f44e4f6a480f00" |
83 | 75 | ||
84 | # 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 |
85 | # required by kernel-yocto.bbclass. | 77 | # required by kernel-yocto.bbclass. |
@@ -89,7 +81,7 @@ SRCREV = "9335a2fd4a7f8f789838c5198ca6da5944c44fa5" | |||
89 | LINUX_VERSION = "5.4.92" | 81 | LINUX_VERSION = "5.4.92" |
90 | 82 | ||
91 | # 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. |
92 | LOCALVERSION = "-imx-5.4.47-2.2.0" | 84 | LOCALVERSION = "-imx-5.4.70-2.3.0" |
93 | 85 | ||
94 | DEFAULT_PREFERENCE = "1" | 86 | DEFAULT_PREFERENCE = "1" |
95 | 87 | ||