image_types_fsl.bbclass: Drop UBOOT_PADDING support

The U-Boot 2009.08 has been removed so every version now supported
does not use padding. This patch drops the code which added the
possibility of use old U-Boot version but which was unused for long
time.

Reported-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index 53f8767a0e4eb938453932d8c14348fc46bd0f53..2f6eb9728c94c8780cd63a5de7b4940378efe64a 100644 (file)
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@ -4,7 +4,6 @@ IMAGE_BOOTLOADER ?= "u-boot"
 
 # Handle u-boot suffixes
 UBOOT_SUFFIX ?= "bin"
-UBOOT_PADDING ?= "0"
 UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}"
 
 #
@@ -135,7 +134,7 @@ generate_imx_sdcard () {
                        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=69 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
+                       dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 bs=512
                fi
                ;;
                barebox)
@@ -252,7 +251,7 @@ generate_mxs_sdcard () {
                parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
                parted -s ${SDCARD} unit KiB mkpart primary $(expr  ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
 
-               dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024)
+               dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024)
                BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \
                | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }')