From 7fc51c7c08bbc034d269a09fb2e170e293db9ae9 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 9 Feb 2022 17:46:10 +0000 Subject: [PATCH] arm-bsp/linux-yocto: remove redundant kernel hacking The CS1K kernel used overrides to empty the kernel-image package, so the initramfs didn't contain a kernel image. The initramfs contained a kernel via a bad dependency in ffa-debugfs-mod, but now that has been worked around we can remove the CS1K workaround. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../linux/linux-arm-platforms.inc | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 0f62011c..a8d12841 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -91,24 +91,6 @@ SRC_URI:append:corstone1000 = " ${@bb.utils.contains('MACHINE_FEATURES', \ # corstone1000 has limited flash memory constraints KERNEL_EXTRA_FEATURES:corstone1000 = "" KERNEL_FEATURES:corstone1000 = "" -# No need to include the kernel image in the rootfs -# So, let's delete the package doing that and uninstalling the initial -# kernel binary. -# The kernel binary needed is the initramfs bundle - -FILES:kernel-image-image:corstone1000="" - -# Uninstalling the initial kernel binary - -do_install:append:corstone1000() { - if [ -e "${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}" ]; then - rm ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION} - fi - - if [ -e "${D}/${KERNEL_IMAGEDEST}/$imageType" ]; then - rm ${D}/${KERNEL_IMAGEDEST}/$imageType - fi -} # # FVP BASE KMACHINE