aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-02-05 08:59:36 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-02-05 23:00:30 -0200
commitdb45be1b9a90d08d1c4b7bced132a4985d7c8da2 (patch)
treef52c7ec26b87dbdbccc02cfcfef2ad2c12803b8c
parent73f4a5689749ce75fadaa5eb190b2e6728069cd0 (diff)
downloadmeta-fsl-arm-db45be1b9a90d08d1c4b7bced132a4985d7c8da2.tar.gz
meta-fsl-arm-db45be1b9a90d08d1c4b7bced132a4985d7c8da2.tar.bz2
meta-fsl-arm-db45be1b9a90d08d1c4b7bced132a4985d7c8da2.zip
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>
-rw-r--r--classes/image_types_fsl.bbclass5
1 files 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 }')