summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Drozdov <denys.drozdov@toradex.com>2021-01-28 13:42:43 +0000
committerMax Krummenacher <max.krummenacher@toradex.com>2021-02-22 18:34:26 +0100
commit20cb5e84342dc0c9c56f5cea3e97af44070ce820 (patch)
tree28d46871ebc32307c6be27515291159bdc06387e
parenteffd05d0d0bb092e04b1c8ca805c4932bdf638c1 (diff)
linux-toradex: change kernel recipe to linux-toradex_5.4-2.3.x.bb
Switch to linux-toradex branch toradex_5.4-2.3.x-imx Related-to: ELB-3513, ELB-3515, ELB-3509 Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com> (cherry picked from commit 93c2fe20206766c424a4d6d879045bbbe8a56479)
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch)0
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch)0
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.cfg (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.cfg)0
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.scc (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.scc)0
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.cfg (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.cfg)0
-rw-r--r--recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.scc (renamed from recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.scc)0
-rw-r--r--recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb (renamed from recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb)13
7 files changed, 6 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
index 4dc1dae..4dc1dae 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
index 9296878..9296878 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.cfg b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.cfg
index a9c88bd..a9c88bd 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.scc b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.scc
index edd1519..edd1519 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt-less-latency.scc
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt-less-latency.scc
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.cfg b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.cfg
index f76e447..f76e447 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.scc b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.scc
index 82d27dc..82d27dc 100644
--- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/preempt-rt.scc
+++ b/recipes-kernel/linux/linux-toradex-5.4-2.3.x/preempt-rt.scc
diff --git a/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
index f013531..db7e61d 100644
--- a/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
@@ -14,15 +14,15 @@ SRC_URI = " \
KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
inherit toradex-kernel-localversion
-LINUX_VERSION = "5.4.77"
+LINUX_VERSION = "5.4.91"
# skip, as with use-head-next LINUX_VERSION might be set wrongly
KERNEL_VERSION_SANITY_SKIP_use-head-next = "1"
# Make sure to override LOCALVERSION in linux-imx.inc
LOCALVERSION = "-${TDX_VERSION}"
-SRCBRANCH = "toradex_5.4-2.1.x-imx"
-SRCREV_machine = "1266d0110fcedb08c996124ddb33bddd98ed61f5"
+SRCBRANCH = "toradex_5.4-2.3.x-imx"
+SRCREV_machine = "6ad99da2c6759b59bf4b1f6aba70859fcbae7c9e"
SRCREV_machine_use-head-next = "${AUTOREV}"
DEPENDS += "lzop-native bc-native"
@@ -32,7 +32,7 @@ KBUILD_DEFCONFIG_apalis-imx6 ?= "apalis_imx6_defconfig"
KBUILD_DEFCONFIG_colibri-imx6 ?= "colibri_imx6_defconfig"
KBUILD_DEFCONFIG_colibri-imx6ull ?= "colibri-imx6ull_defconfig"
KBUILD_DEFCONFIG_mx7 ?= "colibri_imx7_defconfig"
-KBUILD_DEFCONFIG_mx8 ?= "defconfig"
+KBUILD_DEFCONFIG_mx8 ?= "toradex_defconfig"
###############################################################################
# Apply the RT patch and change the configuration to use PREMPT_RT when the
@@ -43,7 +43,7 @@ KBUILD_DEFCONFIG_mx8 ?= "defconfig"
# both possible storage locations.
MIRRORS_append_preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/"
SRC_URI_append_preempt-rt = " \
- ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/patch-5.4.77-rt43.patch.xz;name=rt-patch \
+ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/patch-5.4.91-rt50.patch.xz;name=rt-patch \
file://preempt-rt.scc \
file://preempt-rt-less-latency.scc \
"
@@ -53,5 +53,4 @@ SRC_URI_append_preempt-rt = " \
# file://0002-ddr-perf-prevent-BUG-with-rt-patch.patch \
#
-SRC_URI[rt-patch.md5sum] = "cf96e01e04ec8743e4b24caec76d2c2d"
-SRC_URI[rt-patch.sha256sum] = "a0966fb60ce26f28e4dea5eb9db2e62974e1391470ea1bdb88e2d884a3280dc4"
+SRC_URI[rt-patch.sha256sum] = "3152fac82ee4357f89035736de707545b36b1816536d17cc76bd830b488a2923"