From b34b4fe8fcbd1a1ff74c01af5abc8ca4d3c841d9 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 18 Jun 2016 12:07:03 +0100 Subject: [PATCH] linux-raspberrypi: rpi-mkimage is no longer needed Recent versions of the Raspberry Pi firmware can directly handle kernel images which use device tree. The modifications made by rpi-mkimage are no longer needed. Signed-off-by: Paul Barker --- recipes-kernel/linux/linux-raspberrypi.inc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 6133b02..6184402 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -35,13 +35,6 @@ python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True)) d.setVar("KERNEL_DEVICETREE", kerneldt) - - # Add dependency to 'rpi-mkimage-native' package only if RPi bootloader is used with DT-enable kernel - if kerneldt: - if kerneltype != 'uImage' and len(kerneldt.strip()) > 1: - depends = d.getVar("DEPENDS", True) - depends = "%s rpi-mkimage-native" % depends - d.setVar("DEPENDS", depends) } do_kernel_configme_prepend() { @@ -62,17 +55,6 @@ do_deploy_append() { echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt } -do_rpiboot_mkimage() { - if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then - if test -n "${KERNEL_DEVICETREE}"; then - # Add RPi bootloader trailer to kernel image to enable DeviceTree support - for type in ${KERNEL_IMAGETYPES} ; do - ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT_DIR}/$type ${KERNEL_OUTPUT_DIR}/$type - done - fi - fi -} - do_bundle_initramfs_append() { if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then @@ -85,5 +67,3 @@ do_bundle_initramfs_append() { fi fi } - -addtask rpiboot_mkimage before do_install after do_compile