From c64d5870feb590adc18789706840652d0d4f3d37 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 5 Mar 2013 18:17:14 -0300 Subject: 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 --- classes/image_types_fsl.bbclass | 4 ++-- 1 file 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 () { UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native u-boot" IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ - ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD}" + ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard" # Boot partition volume id BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" @@ -216,7 +216,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}/u-boot-${MACHINE}.${UBOOT_SUFFIX_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 skip=${UBOOT_PADDING} 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 }') -- cgit v1.2.3-54-g00ecf