diff options
author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-09-04 12:14:38 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-09-12 11:27:40 -0300 |
commit | 44ec302ce45a2cc04349a84bafc9a0b0ac579040 (patch) | |
tree | 8a16cb798655aa75766cf85d223cbf13a1a3cac3 /recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch | |
parent | fb2af4fd2041d7e9833c73077348fecf7260d789 (diff) |
linux-toradex: update to toradex_5.15-2.2.x-imx
Update the downstream kernel (NXP fork) to lf-5.15-2.2.0 plus fslc
stable patches merges.
Then rebase our 5.15-2.1.0 on top of it [1].
For the RT kernel, set the matching RT patch.
[1] https://github.com/Freescale/linux-fslc/commit/7c13adcd3af7dcd541144655102e1cdb941ad538
Related-to: ELB-5185
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
(cherry picked from commit 65db2ad74d40b30e4ea1421ce699cad62d08b0a8)
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch')
-rw-r--r-- | recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch new file mode 100644 index 0000000..5ade25c --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch @@ -0,0 +1,28 @@ +From 572fd569bff28f25e83b8466c77ccb821675771a Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Sun, 13 Nov 2022 13:36:24 +0100 +Subject: [PATCH 4/5] Revert "arch/arm/Kconfig: prepare for rt patch" + +This reverts commit 8e60810e199661b607557e560b329097dc3fea0e. +Revert the changes made to make the RT-Patch apply. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 0e8631b96e0f..d5b9364334e0 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -128,6 +128,7 @@ config ARM + select PERF_USE_VMALLOC + select HAVE_POSIX_CPU_TIMERS_TASK_WORK if !KVM + select RTC_LIB ++ select SET_FS + select SYS_SUPPORTS_APM_EMULATION + select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M + # Above selects are sorted alphabetically; please add new ones +-- +2.35.3 + |