From d49bd07c5b54defc7cec5829d287a2bd82ae9afe Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 18 Jun 2016 12:07:04 +0100 Subject: u-boot: Use mainline u-boot recipe from oe-core The repository used by u-boot-rpi has not been updated since 2012. In the meantime, mailine u-boot has gained Raspberry Pi support. All we need to do is set UBOOT_MACHINE to an appropriate value in the machine config files. Currently configs are only provided for raspberrypi and raspberrypi2. The master branch of u-boot now also appears to have a config file for raspberrypi3 so support for this can be added in the future when u-boot is upgraded in oe-core. The mainline u-boot recipe creates the file "u-boot.bin" instead of "u-boot.img". Signed-off-by: Paul Barker --- classes/sdcard_image-rpi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 4dfd7a3..20bd314 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -105,7 +105,7 @@ IMAGE_CMD_rpi-sdimg () { mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ case "${KERNEL_IMAGETYPE}" in "uImage") - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE} + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage ;; *) -- cgit v1.2.3-54-g00ecf