diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-10-03 17:03:32 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-10-03 18:18:18 +0200 |
| commit | 3bf131afb4f733291295b8081fdd0eb201f6c90d (patch) | |
| tree | d5b369ba256687962721667896552317a5e8b480 | |
| parent | a82b69e087ef1fc23eb72b20cafb7bfb1538f216 (diff) | |
image_type_tezi: uboot_binary handling cbootimage for apalis tk1
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | classes/image_type_tezi.bbclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 422cc6f..9b0ac40 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -2,7 +2,10 @@ inherit image_types IMAGE_DEPENDS_teziimg = "tezi-metadata:do_deploy virtual/bootloader" -UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" +UBOOT_BINARY ??= "u-boot.${UBOOT_SUFFIX}" +UBOOT_BINARY_TEZI = "${UBOOT_BINARY}" +UBOOT_BINARY_TEZI_apalis-tk1 = "apalis-tk1.img" +UBOOT_BINARY_TEZI_apalis-tk1-mainline = "apalis-tk1.img" def rootfs_get_size(d): import subprocess @@ -42,7 +45,7 @@ def rootfs_tezi_emmc(d): }) bootpart_rawfiles.append( { - "filename": d.getVar('UBOOT_BINARY', True), + "filename": d.getVar('UBOOT_BINARY_TEZI', True), "dd_options": "seek=" + (offset_spl if has_spl else offset_bootrom) }) @@ -98,7 +101,7 @@ def rootfs_tezi_rawnand(d): "name": "u-boot1", "content": { "rawfile": { - "filename": d.getVar('UBOOT_BINARY', True), + "filename": d.getVar('UBOOT_BINARY_TEZI', True), "size": 1 } }, @@ -107,7 +110,7 @@ def rootfs_tezi_rawnand(d): "name": "u-boot2", "content": { "rawfile": { - "filename": d.getVar('UBOOT_BINARY', True), + "filename": d.getVar('UBOOT_BINARY_TEZI', True), "size": 1 } } @@ -219,7 +222,7 @@ IMAGE_CMD_teziimg () { # The first transform strips all folders from the files to tar, the # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}. # The third transform removes zImage from the device tree. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz ;; *) # Create bootfs... @@ -228,7 +231,7 @@ IMAGE_CMD_teziimg () { # The first transform strips all folders from the files to tar, the # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}. - ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.tar.xz ;; esac } |