summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-raspberrypi.inc20
1 files changed, 0 insertions, 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 () {
35 kerneltype = d.getVar('KERNEL_IMAGETYPE', True) 35 kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
36 kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True)) 36 kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True))
37 d.setVar("KERNEL_DEVICETREE", kerneldt) 37 d.setVar("KERNEL_DEVICETREE", kerneldt)
38
39 # Add dependency to 'rpi-mkimage-native' package only if RPi bootloader is used with DT-enable kernel
40 if kerneldt:
41 if kerneltype != 'uImage' and len(kerneldt.strip()) > 1:
42 depends = d.getVar("DEPENDS", True)
43 depends = "%s rpi-mkimage-native" % depends
44 d.setVar("DEPENDS", depends)
45} 38}
46 39
47do_kernel_configme_prepend() { 40do_kernel_configme_prepend() {
@@ -62,17 +55,6 @@ do_deploy_append() {
62 echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt 55 echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
63} 56}
64 57
65do_rpiboot_mkimage() {
66 if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
67 if test -n "${KERNEL_DEVICETREE}"; then
68 # Add RPi bootloader trailer to kernel image to enable DeviceTree support
69 for type in ${KERNEL_IMAGETYPES} ; do
70 ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT_DIR}/$type ${KERNEL_OUTPUT_DIR}/$type
71 done
72 fi
73 fi
74}
75
76do_bundle_initramfs_append() { 58do_bundle_initramfs_append() {
77 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then 59 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
78 if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then 60 if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
@@ -85,5 +67,3 @@ do_bundle_initramfs_append() {
85 fi 67 fi
86 fi 68 fi
87} 69}
88
89addtask rpiboot_mkimage before do_install after do_compile