diff options
Diffstat (limited to 'meta-fsl-arm/classes')
| -rw-r--r-- | meta-fsl-arm/classes/image_types_fsl.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass index 53f8767a0..2f6eb9728 100644 --- 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" | |||
| 4 | 4 | ||
| 5 | # Handle u-boot suffixes | 5 | # Handle u-boot suffixes |
| 6 | UBOOT_SUFFIX ?= "bin" | 6 | UBOOT_SUFFIX ?= "bin" |
| 7 | UBOOT_PADDING ?= "0" | ||
| 8 | UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" | 7 | UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" |
| 9 | 8 | ||
| 10 | # | 9 | # |
| @@ -135,7 +134,7 @@ generate_imx_sdcard () { | |||
| 135 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=2 bs=512 | 134 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=2 bs=512 |
| 136 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=69 bs=1K | 135 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=69 bs=1K |
| 137 | else | 136 | else |
| 138 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 skip=${UBOOT_PADDING} bs=512 | 137 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 bs=512 |
| 139 | fi | 138 | fi |
| 140 | ;; | 139 | ;; |
| 141 | barebox) | 140 | barebox) |
| @@ -252,7 +251,7 @@ generate_mxs_sdcard () { | |||
| 252 | parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) | 251 | parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) |
| 253 | parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) | 252 | parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) |
| 254 | 253 | ||
| 255 | dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024) | 254 | dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024) |
| 256 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | 255 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ |
| 257 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') | 256 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') |
| 258 | 257 | ||
