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 <p...@paulbarker.me.uk>
---
recipes-kernel/linux/linux-raspberrypi.inc | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
b/recipes-kernel/linux/linux-raspberrypi.inc
index dd477cd..c6bb8e8 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -34,13 +34,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() {
@@ -61,15 +54,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
- ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
${KERNEL_OUTPUT}
- fi
- fi
-}
-
do_bundle_initramfs_append() {
if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
@@ -80,5 +64,3 @@ do_bundle_initramfs_append() {
fi
fi
}
-
-addtask rpiboot_mkimage before do_install after do_compile
--
2.1.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
