diff --git a/bsp/meta-kunpeng/conf/machine/kp920.conf b/bsp/meta-kunpeng/conf/machine/kp920.conf index 1267172d3456fcdac7c7940a5ac6371ebee03d40..4d997954401416ac49fa9543d42cc1be51709193 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 99e9020873897b108218c61680d3d9bf955ae21b..a29c33e95ab4c95a1838b227a2f1d82037df9e5f 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"