image_types_fsl.bbclass: Add U-Boot SPL support

If the SPL_BINARY value is not empty, then the class will use
an alternative code path for copying U-Boot on the SD card.
u-boot.img is used (not .imx), and the SPL binary is prepended.
With empty SPL_BINARY values, the behavior is just like before.

Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index 7fd6a29d846fa1fbc11ea2567bcfd74113eca3d0..443abf7e595d2f4521f8a4ad7917983af786b7c0 100644 (file)
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@ -115,7 +115,12 @@ generate_imx_sdcard () {
                exit 1
                ;;
                u-boot)
-               dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 skip=${UBOOT_PADDING} bs=512
+               if [ -n "${SPL_BINARY}" ]; then
+                       dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=2 bs=512
+                       dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=42 bs=1K
+               else
+                       dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 skip=${UBOOT_PADDING} bs=512
+               fi
                ;;
                barebox)
                dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512