From 47ec28d79efa9baff290eb87d5d44efc0c48f056 Mon Sep 17 00:00:00 2001
From: alichinese <lixinyu44@huawei.com>
Date: Mon, 14 Jul 2025 09:17:42 +0800
Subject: [PATCH] kernel: modify tspi-3566 inc place

* refactored the method of including machine configuration files
  at the kernel level

Signed-off-by: alichinese <lixinyu44@huawei.com>
---
 .../recipes-kernel/linux/linux-rockchip.inc      | 16 ----------------
 .../rockchip/recipes-kernel/linux/ok3568.inc     |  4 ++++
 .../rockchip/recipes-kernel/linux/tspi-3566.inc  | 10 ++++++++++
 .../recipes-kernel/linux/linux-openeuler.bb      |  5 +++++
 4 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc
 create mode 100644 bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc

diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc
index ffd9b91e426..ae801ad1e85 100644
--- a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc
+++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc
@@ -18,24 +18,8 @@ SRC_URI:append = " \
 
 INHIBIT_PACKAGE_STRIP = "1"
 
-# mcs patch for ok3568 devicetree
-SRC_URI:append:ok3568 = " \
-    ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'file://patches/0003-ok3568-support-mcs.patch', '', d)} \
-"
-
 S = "${WORKDIR}/rockchip-kernel"
 
-# tspi-3566 settings
-SRC_URI:tspi-3566 = " \
-    file://rockchip-kernel-tspi-3566 \
-    file://patches/0001-fix-wl_android-module-compile-about-rev_info_delim-i.patch \
-"
-OPENEULER_LOCAL_NAME:tspi-3566 = "rockchip-kernel-tspi-3566"
-OPENEULER_REPO_NAMES:tspi-3566 = "rockchip-kernel-tspi-3566"
-S:tspi-3566 = "${WORKDIR}/rockchip-kernel-tspi-3566"
-PV:tspi-3566 = "5.10.209"
-DEPENDS:tspi-3566:append = " lz4-native "
-
 OPENEULER_KERNEL_CONFIG = "file://config/${SOC_FAMILY}/defconfig"
 
 # mkimg need use dtc command
diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc
new file mode 100644
index 00000000000..fceb8527bf6
--- /dev/null
+++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/ok3568.inc
@@ -0,0 +1,4 @@
+# mcs patch for ok3568 devicetree
+SRC_URI:append:ok3568 = " \
+    ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'file://patches/0003-ok3568-support-mcs.patch', '', d)} \
+"
diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc
new file mode 100644
index 00000000000..53d1b7d2546
--- /dev/null
+++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/tspi-3566.inc
@@ -0,0 +1,10 @@
+# tspi-3566 settings
+SRC_URI:tspi-3566 = " \
+    file://rockchip-kernel-tspi-3566 \
+    file://patches/0001-fix-wl_android-module-compile-about-rev_info_delim-i.patch \
+"
+OPENEULER_LOCAL_NAME:tspi-3566 = "rockchip-kernel-tspi-3566"
+OPENEULER_REPO_NAMES:tspi-3566 = "rockchip-kernel-tspi-3566"
+S:tspi-3566 = "${WORKDIR}/rockchip-kernel-tspi-3566"
+PV:tspi-3566 = "5.10.209"
+DEPENDS:tspi-3566:append = " lz4-native "
diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb
index f79c362ff62..5437aef1a96 100644
--- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb
+++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb
@@ -1,4 +1,9 @@
 require recipes-kernel/linux/linux-openeuler.inc
+# Each machine has its own dedicated configuration file, which is named after
+# the machine with the suffix "inc". Each machine's configuration file can
+# specify its own variables. For example, for the machine "tspi-3566", when
+# setting the PV (process variable), it should be specified as follows: PV:tspi-3566.
+include recipes-kernel/linux/${MACHINE}.inc
 
 COMPATIBLE_MACHINE= "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', '\
 qemuarm64|qemux86|qemux86-64|qemu-aarch64|raspberrypi4-64|generic-x86-64\
-- 
Gitee