From 0d2130625b09f4b070065ea4b0dccc8bf147d639 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 10 Aug 2016 13:11:50 +0200 Subject: [PATCH] image-types_digi.bbclass: fix u-boot image for SDCARD when TF is enabled When TRUSTFENCE_SIGN is enabled, the u-boot binary for the SDCARD image needs to be the "signed" one. https://jira.digi.com/browse/DEL-2876 Signed-off-by: Javier Viguera --- meta-digi-arm/classes/image_types_digi.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 1805de6e7..9588d2d86 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -185,8 +185,14 @@ IMAGE_CMD_sdcard() { parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) -1s parted -s ${SDIMG} unit KiB print + # Set u-boot image to flash depending on whether TRUSTFENCE_SIGN is enabled + SDIMG_UBOOT="${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}" + if [ "${TRUSTFENCE_SIGN}" = "1" ]; then + SDIMG_UBOOT="$(readlink -e ${SDIMG_UBOOT} | sed -e 's,u-boot-,u-boot-signed-,g')" + fi + # Burn bootloader, boot and rootfs partitions - dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK} of=${SDIMG} conv=notrunc,fsync seek=2 bs=512 + dd if=${SDIMG_UBOOT} of=${SDIMG} conv=notrunc,fsync seek=2 bs=512 dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024) }