From 15f2495f8ce0f488988dfb05d15d6ac3434f5aa0 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 4 Dec 2019 10:44:19 +0100 Subject: image_type_tezi.bbclass: refacture/unify u-boot artefacts The list of deployed U-Boot artefacts is set in python for the 'distro' tezi-image, but in the non 'distro' case directly in the tar command. Unify that to put the list together in python. Signed-off-by: Max Krummenacher Signed-off-by: Ming Liu --- classes/image_type_tezi.bbclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index b2a1e4b..ced429c 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -311,13 +311,19 @@ python rootfs_tezi_run_json() { if flash_type == "rawnand": flash_data = rootfs_tezi_rawnand(d) uenv_file = d.getVar('UBOOT_ENV_TEZI_RAWNAND') + uboot_file = d.getVar('UBOOT_BINARY_TEZI_RAWNAND') elif flash_type == "emmc": flash_data = rootfs_tezi_emmc(d) uenv_file = d.getVar('UBOOT_ENV_TEZI_EMMC') + uboot_file = d.getVar('UBOOT_BINARY_TEZI_EMMC') + # TODO: Multi image/raw NAND with SPL currently not supported + if d.getVar('SPL_BINARY'): + uboot_file += " " + d.getVar('SPL_BINARY') else: bb.fatal("Toradex flash type unknown") rootfs_tezi_json(d, flash_type, flash_data, "image.json", uenv_file) + d.appendVar("TEZI_IMAGE_UBOOT_FILES", uenv_file + " " + uboot_file + " ") } python tezi_deploy_bootfs_files() { @@ -345,7 +351,7 @@ IMAGE_CMD_teziimg () { --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh \ - ${SPL_BINARY} ${UBOOT_BINARY_TEZI_RAWNAND} ${UBOOT_ENV_TEZI_RAWNAND} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} \ + ${TEZI_IMAGE_UBOOT_FILES} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} ;; *) @@ -356,7 +362,7 @@ IMAGE_CMD_teziimg () { --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar \ image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh \ - ${SPL_BINARY} ${UBOOT_BINARY_TEZI_EMMC} ${UBOOT_ENV_TEZI_EMMC} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_BOOT_SUFFIX} \ + ${TEZI_IMAGE_UBOOT_FILES} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_BOOT_SUFFIX} \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} ;; esac -- cgit v1.2.3