diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2022-07-14 18:21:50 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2022-07-25 11:22:10 +0000 |
| commit | e8e2838d64bdde4c1afd1993be5364db83dc9be0 (patch) | |
| tree | b18451ee27c67c856551b008a72c63db85aee2fe | |
| parent | 68683eea0cee65322ea883d6b3f282ff8f09dc89 (diff) | |
linux-toradex_5.15-2.0.x.bb: forward port recipe
- Adjust hashes
- Take in new corresponding RT-patch
- Delete machines we won't support
- Drop already commented out patches
Related-to: ELB-4597
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb b/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb index d7949ff..c56bccf 100644 --- a/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb +++ b/recipes-kernel/linux/linux-toradex_5.15-2.0.x.bb @@ -14,25 +14,20 @@ SRC_URI = " \ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" inherit toradex-kernel-localversion -LINUX_VERSION = "5.4.193" +LINUX_VERSION = "5.15.40" # 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.3.x-imx" -SRCREV_machine = "5a24da287b86482b0d13352d3a12fa16c81a03f0" +SRCBRANCH = "toradex_5.15-2.0.x-imx" +SRCREV_machine = "8fe4fe4ac6ffc1510f98e3776895bbc1c07329a8" SRCREV_machine:use-head-next = "${AUTOREV}" -DEPENDS += "lzop-native bc-native" -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" +DEPENDS += "bc-native" +COMPATIBLE_MACHINE = "mx8-nxp-bsp" -KBUILD_DEFCONFIG:apalis-imx6 ?= "apalis_imx6_defconfig" -KBUILD_DEFCONFIG:colibri-imx6 ?= "colibri_imx6_defconfig" -KBUILD_DEFCONFIG:colibri-imx6ull ?= "colibri-imx6ull_defconfig" -KBUILD_DEFCONFIG:colibri-imx6ull-emmc ?= "colibri-imx6ull_defconfig" -KBUILD_DEFCONFIG:mx7-nxp-bsp ?= "colibri_imx7_defconfig" KBUILD_DEFCONFIG:mx8-nxp-bsp ?= "toradex_defconfig" export DTC_FLAGS = "-@" @@ -44,16 +39,11 @@ export DTC_FLAGS = "-@" # patches get moved into the 'older' directory when superseeded, so provide # 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/" +MIRRORS:append:preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/" SRC_URI:append:preempt-rt = " \ - ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/patch-5.4.193-rt74.patch.xz;name=rt-patch \ + ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/patch-5.15.40-rt43.patch.xz;name=rt-patch \ file://preempt-rt.scc \ file://preempt-rt-less-latency.scc \ " -# This patches do currently not apply but are likely needed or we get -# runtime bugs. -# file://0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch \ -# file://0002-ddr-perf-prevent-BUG-with-rt-patch.patch \ -# -SRC_URI[rt-patch.sha256sum] = "821d7bf3015d90e86eace5869d5596eacc9e4b5bd80644d40207817c4b8cc4be" +SRC_URI[rt-patch.sha256sum] = "dc9225c538effa9026def0587fae27344a38dc7581658bbabc739bd6883706d4" |