From 6f8e87d6c4e9b1d2dbc0ab6e2db91535961b4a8e Mon Sep 17 00:00:00 2001 From: Slim6882 Date: Sat, 22 Feb 2025 18:58:33 +0800 Subject: [PATCH] kp920: unsurppot zImage to fix a compile error The Kunpeng 920 embedded version does not support zImage, so we remove the zImage patch in its yocto recipe Signed-off-by: Slim6882 --- bsp/meta-kunpeng/conf/machine/kp920.conf | 2 +- bsp/meta-kunpeng/recipes-kernel/linux/linux-kp920.inc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bsp/meta-kunpeng/conf/machine/kp920.conf b/bsp/meta-kunpeng/conf/machine/kp920.conf index 1267172d345..4d997954401 100644 --- a/bsp/meta-kunpeng/conf/machine/kp920.conf +++ b/bsp/meta-kunpeng/conf/machine/kp920.conf @@ -11,7 +11,7 @@ MULTILIBS = "" ROOTFS_PACKAGE_ARCH = "aarch64" # set IMAGETYPE and dtb -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "Image" # choose dtb file KERNEL_DEVICETREE = "" ENABLE_UART = "1" diff --git a/bsp/meta-kunpeng/recipes-kernel/linux/linux-kp920.inc b/bsp/meta-kunpeng/recipes-kernel/linux/linux-kp920.inc index 99e90208738..a29c33e95ab 100644 --- a/bsp/meta-kunpeng/recipes-kernel/linux/linux-kp920.inc +++ b/bsp/meta-kunpeng/recipes-kernel/linux/linux-kp920.inc @@ -1,6 +1,14 @@ # add recipes-kernel path to find patch and defconfig FILESEXTRAPATHS:append := "${THISDIR}/files/:" +SRC_URI:remove:aarch64 = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', ' \ + file://patches/${ARCH}/0001-kernel6.6-arm64-add-zImage-support-for-arm64.patch \ + ', ' \ + file://patches/${ARCH}/0001-arm64-add-zImage-support-for-arm64.patch \ + ', d)} \ +" + CONFIGVERSION="${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', 'kernel6-', '', d)}" OPENEULER_KERNEL_CONFIG = "file://${CONFIGVERSION}config/kp920/defconfig" -- Gitee