diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-11-30 16:18:52 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-11-30 16:18:52 +0100 |
| commit | 72cff8145fd67e0f2d0809e2a547b7e514c88118 (patch) | |
| tree | 556e3d2e4ca655bcb4e51e508cb0d48afb161fe0 | |
| parent | 3c9ed2641a6317a4fd9db77ecd508d4008cbad74 (diff) | |
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 <max.krummenacher@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 91ca573..5369c96 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -314,13 +314,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() { @@ -354,7 +360,7 @@ IMAGE_CMD_teziimg () { --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}-${DATE}.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} ;; *) @@ -365,7 +371,7 @@ IMAGE_CMD_teziimg () { --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' \ -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}-${DATE}.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}.bootfs.tar.xz \ + ${TEZI_IMAGE_UBOOT_FILES} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.bootfs.tar.xz \ ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} ;; esac |