diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-03-05 18:17:14 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-03-07 10:06:16 -0300 |
commit | c64d5870feb590adc18789706840652d0d4f3d37 (patch) | |
tree | 896694a3af16ce564baca5f1ba3d05c104a22572 /classes | |
parent | 868a4f565aa4a5714b976fcb8b16ba0f3b200e57 (diff) | |
download | meta-fsl-arm-c64d5870feb590adc18789706840652d0d4f3d37.tar.gz |
image_types_fsl.bbclass: Fix deploy of mxsboot-sdcard image
The mxsboot-sdcard image is the current way we use to generate the
U-Boot bootstream blob during image generation however Yocto image
system enforces some naming schema so the symbolic links does work and
we weren't following those. This patch uses the '${IMAGE_NAME}'
variable and the proper image suffix so the symbolic links now fully
work.
Fixes [YOCTO #3871].
Change-Id: I7f96dcdd58e0a726b8084c1f87ff10732fe259df
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_fsl.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 6bbbc0e..6d1f6dd 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass | |||
@@ -41,7 +41,7 @@ IMAGE_CMD_linux.sb () { | |||
41 | UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" | 41 | UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" |
42 | IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native u-boot" | 42 | IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native u-boot" |
43 | IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ | 43 | IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ |
44 | ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD}" | 44 | ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard" |
45 | 45 | ||
46 | # Boot partition volume id | 46 | # Boot partition volume id |
47 | BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" | 47 | BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" |
@@ -216,7 +216,7 @@ generate_mxs_sdcard () { | |||
216 | parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) | 216 | parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) |
217 | parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) | 217 | parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) |
218 | 218 | ||
219 | dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024) | 219 | dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024) |
220 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | 220 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ |
221 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') | 221 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') |
222 | 222 | ||