From e9de6d816de88b92a0134735a64e280c99772dba Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Sun, 28 Feb 2016 12:47:32 +0100 Subject: [PATCH] linux-raspberrypi: Make sure we have initramfs image before running mkknlimg Signed-off-by: Andrei Gherzan --- recipes-kernel/linux/linux-raspberrypi.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 1befee4..5a8a175 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -66,10 +66,12 @@ do_rpiboot_mkimage() { } do_bundle_initramfs_append() { - if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then - if test -n "${KERNEL_DEVICETREE}"; then - # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}.initramfs ${KERNEL_OUTPUT}.initramfs + if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then + if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then + if test -n "${KERNEL_DEVICETREE}"; then + # Add RPi bootloader trailer to kernel image to enable DeviceTree support + ${STAGING_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}.initramfs ${KERNEL_OUTPUT}.initramfs + fi fi fi }