bsp: linux-lmp-fslc-imx: make patches version-related

Prepare for adding the same patches for other kernel versions.

Isolate linux-lmp-fslc-imx patches compatible only with 6.1.

Move patches common for multiply versions up to linux-lmp-fslc-imx.inc.

Signed-off-by: Oleksandr Suvorov <[email protected]>

meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx.inc

@@ -13,3 +13,24 @@ SRC_URI = "${KERNEL_REPO};protocol=${KERNEL_REPO_PROTOCOL};branch=${KERNEL_BRANC
 KMETA = "kernel-meta"
 
 include recipes-kernel/linux/linux-lmp.inc
+
+SRC_URI += " \
+    file://0004-FIO-toup-hwrng-optee-support-generic-crypto.patch \
+    file://0001-FIO-toimx-of-enable-using-OF_DYNAMIC-without-OF_UNIT.patch \
+    file://0002-FIO-toup-media-Kconfig-fix-double-VIDEO_DEV.patch \
+    file://0003-FIO-toup-gpu-drm-cadence-select-hdmi-helper.patch \
+    file://0004-FIO-toup-media-imx8-select-v4l2_-for-mxc-mipi-csi2_y.patch \
+"
+
+SRC_URI:append:imx8mp-lpddr4-evk = " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'file://0001-FIO-internal-arch-arm64-dts-imx8mp-enable-I2C5-bus.patch', '', d)} \
+"
+
+# Add bluetooth support for QCA9377
+SRC_URI:append:imx8mm-lpddr4-evk = " \
+    file://0001-FIO-toup-arm64-dts-imx8mm-evk-qca-wifi-enable-suppor.patch \
+"
+# Fix bluetooth reset for Murata 1MW
+SRC_URI:append:mx8mn-nxp-bsp = " \
+    file://0001-FIO-internal-arm64-dts-imx8mn-evk.dtsi-re-add-blueto.patch \
+"

meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_6.1.bb

@@ -1,7 +1,9 @@
 # We need to extend files paths because the -rt version of this
 # recipe includes this one and we need to have patches for this
 # recipe available in -rt recipe.
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+# Extend files paths with the short kernel version to be able to keep
+# different patches with the same names for different kernel versions.
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${KSHORT_VER}:${THISDIR}/${PN}:"
 
 KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1"
 
@@ -12,28 +14,8 @@ include recipes-kernel/linux/kmeta-linux-lmp-6.1.y.inc
 # Use Freescale kernel by default
 LINUX_VERSION ?= "6.1.70"
 KERNEL_BRANCH ?= "6.1-2.2.x-imx"
-
 SRCREV_machine = "4e3fc5471376a15279ee5c99e791a7c7b065cbc1"
 
 SRC_URI += " \
-    file://0004-FIO-toup-hwrng-optee-support-generic-crypto.patch \
     file://0001-FIO-extras-arm64-dts-imx8mm-evk-use-imx8mm-evkb-for-.patch \
-    file://0001-arm64-dts-imx8mq-drop-cpu-idle-states.patch \
-    file://0001-FIO-toimx-of-enable-using-OF_DYNAMIC-without-OF_UNIT.patch \
-    file://0002-FIO-toup-media-Kconfig-fix-double-VIDEO_DEV.patch \
-    file://0003-FIO-toup-gpu-drm-cadence-select-hdmi-helper.patch \
-    file://0004-FIO-toup-media-imx8-select-v4l2_-for-mxc-mipi-csi2_y.patch \
-"
-
-SRC_URI:append:imx8mp-lpddr4-evk = " \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'file://0001-FIO-internal-arch-arm64-dts-imx8mp-enable-I2C5-bus.patch', '', d)} \
-"
-
-# Add bluetooth support for QCA9377
-SRC_URI:append:imx8mm-lpddr4-evk = " \
-    file://0001-FIO-toup-arm64-dts-imx8mm-evk-qca-wifi-enable-suppor.patch \
-"
-# Fix bluetooth reset for Murata 1MW
-SRC_URI:append:mx8mn-nxp-bsp = " \
-    file://0001-FIO-internal-arm64-dts-imx8mn-evk.dtsi-re-add-blueto.patch \
 "