[meta-freescale] [meta-fsl-arm][PATCH 8/8] image_types_fsl.bbclass: Drop UBOOT_PADDING support

[Otavio Salvador]

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 at free-electrons.com>
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 classes/image_types_fsl.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 53f8767..2f6eb97 100644
--- a/classes/image_types_fsl.bbclass
+++ b/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 }')
 
-- 
2.1.4