aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-fslc-imx_5.4.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-fslc-imx_5.4.bb')
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.4.bb52
1 files changed, 27 insertions, 25 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
index ef3a7d52..beeeeadc 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
@@ -13,7 +13,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
# This recipe (and corresponding kernel repository and branch) receives updates
# from 3 different sources:
# 1. Stable [linux-5.4.y] branch updates of korg;
-# 2. NXP-specific updates via branch [lf-5.4.y] shared via CodeAurora forum;
+# 2. NXP-specific updates via branch [5.4-2.2.x-imx] shared via CodeAurora forum;
# 3. Critical patches, which are not (yet) integrated into either of 2 above
# sources, but are required to be applied to the kernel tree.
#
@@ -28,34 +28,36 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
# ------------------------------------------------------------------------------
# 1. Stable (tag or SHA(s))
# ------------------------------------------------------------------------------
-# tag: v5.4.51
+# tag: v5.4.110
#
# ------------------------------------------------------------------------------
# 2. NXP-specific (tag or SHA(s))
# ------------------------------------------------------------------------------
-# tag: lf-5.4.y-1.0.0
-# 40fe6bd54230 MLK-23844-2 ARM64: dts: freescale: imx8mm: correct VDDARM@1.6GHz
-# aec0c14ae61d MLK-23844-1: ARM64: dts: freescale: imx8mn-ddr4-evk: cleanup Rhom pmic
-# e8e35fd0e759 MLK-23275-2: ARM64: dts: freescale: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage
-# 975d8ab07267 MLK-23275-1: ARM64: dts: freescale: fsl-imx8mm-evk: correct ldo1/ldo2 voltage
-# 4711466d535c MLK-23562: regulator: core: adjust supply voltage in bypass
-# bbbc26a40a9c MLK-13793-6 regulator: anatop: fix min dropout for bypass mode
+# tag: rel_imx_5.4.70_2.3.0
#
# ------------------------------------------------------------------------------
# 3. Critical patches (SHA(s))
# ------------------------------------------------------------------------------
-# 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
-# f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
-# 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
-# d4b105f930e2 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S'
-# e778467f65d0 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
-# 8b39f5e53831 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
-# 3bee262233eb ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file
-# 40a6a98b3f38 ARM: imx: Fix boot crash if ocotp is not found
-# 8aad5031be00 ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
-# 564409aa3b33 soc: imx-scu: Using existing serial_number instead of UID
-# 0ee8e005bbfc soc: imx8: Using existing serial_number instead of UID
-# 134cbb845fc7 ARM: imx: Add serial number support for i.MX6/7 SoCs
+# b598b85172f7 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set
+# 845099bfd0b8 fbdev: fix fbinfo flag dropped upstream
+# 847bfb09bb3b arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
+# d7ca6973c6d4 arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp
+# 539d19f12066 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL
+# 169b71ce3f8a arm: imx: do not include smp_wfe_imx6.S for i.MX6SX
+# 60be4c625594 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6
+# f393781fa575 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ
+# e0e74faf6af4 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
+# ad24781aecc3 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
+# d56aa09ed0e0 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
+# 923bc9e57b24 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S'
+# f952a6404d10 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
+# 1fdb6565a632 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
+# 4fb833f01c30 ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file
+# 54c975dabcde ARM: imx: Fix boot crash if ocotp is not found
+# 1041cd02b33c ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
+# 974b100d789c soc: imx-scu: Using existing serial_number instead of UID
+# 6fbfed9afe99 soc: imx8: Using existing serial_number instead of UID
+# 64d8ea803af5 ARM: imx: Add serial number support for i.MX6/7 SoCs
#
# NOTE to upgraders:
# This recipe should NOT collect individual patches, they should be applied to
@@ -68,18 +70,18 @@ include linux-fslc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-SRCBRANCH = "5.4-1.0.0-imx"
-SRCREV = "9fb52fae75909b9ca83b2a04e824f97d2df85302"
+KBRANCH = "5.4-2.3.x-imx"
+SRCREV = "0b75fb32ce4bed3f44bd0e2e78c4f08521fac3c8"
# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
# required by kernel-yocto.bbclass.
#
# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
# should be updated once patchlevel is merged.
-LINUX_VERSION = "5.4.51"
+LINUX_VERSION = "5.4.110"
# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-lf-5.4.y"
+LOCALVERSION = "-imx-5.4.70-2.3.0"
DEFAULT_PREFERENCE = "1"