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 ffd9b91e426537576ff062762e33f4d954436858..ae801ad1e851ef19212e755364d13c721bd7d0af 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 0000000000000000000000000000000000000000..fceb8527bf6b570f6d9a3c977128b037b7e32125 --- /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 0000000000000000000000000000000000000000..53d1b7d25467d9fef136133ea271eddf8ab6c4d9 --- /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 f79c362ff6278c86f3e2b4adebf665248fbfb0c5..5437aef1a967bfe90f5dd7e61a1c6ddf6a6e7a28 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\