diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-02-14 09:40:49 +0000 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-02-25 19:52:58 +0200 |
| commit | 8f879f23e60a115b24f0b2519d27857b72319b9f (patch) | |
| tree | 08365cf8fa452a36f2299994ec340158e9257085 | |
| parent | 01da4002c400f85f587817301a4d904cf0252915 (diff) | |
jetson: update tegraflash support
Use the custom post step to add our image prepare script for the
tegraflash. Update the prepare script to work for tegra194 boards
(such as agx xavier) that use the partition file instead of full
image file.
Task-number: QTBUG-100516
Change-Id: I2ca49c30413fcaf56d936c56d6a628902e302caa
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 27bf93870a57e7a340afe96975cc5e7441bddb35)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/include/jetson.inc | 5 | ||||
| -rw-r--r-- | meta-boot2qt/classes/image_types_tegra_b2qt.bbclass | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index e2ef26f2..f82a466f 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -41,6 +41,7 @@ WKS_FILE = "tegra-bootdisk.wks.in" DEPLOY_CONF_NAME:jetson-tx1-devkit = "NVIDIA Jetson TX1 Development Kit" DEPLOY_CONF_NAME:jetson-tx2-devkit = "NVIDIA Jetson TX2 Development Kit" +DEPLOY_CONF_NAME:jetson-agx-xavier-devkit = "NVIDIA Jetson AGX Xavier Development Kit" DEPLOY_CONF_IMAGE_TYPE = "wic.xz" @@ -50,7 +51,7 @@ QBSP_IMAGE_CONTENT += "\ ${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} \ ${IMAGE_LINK_NAME}.conf \ ${IMAGE_LINK_NAME}.info \ - ${IMAGE_LINK_NAME}.flasher.tar.gz \ + ${IMAGE_LINK_NAME}.tegraflash.tar.gz \ " # NVIDIA's Vulkan support is for X only diff --git a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass index e006b64d..5a451cbb 100644 --- a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass +++ b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -28,8 +28,7 @@ ############################################################################ # create flash package that utilizes the SD card image -create_tegraflash_pkg:append() { - cd ${WORKDIR}/tegraflash +tegraflash_custom_post:tegra186() { cat > prepare-image.sh <<END #!/bin/sh -e if [ ! -e "${IMAGE_BASENAME}.img" ]; then @@ -41,9 +40,16 @@ echo "Flash image ready" END chmod +x prepare-image.sh rm ${IMAGE_BASENAME}.img +} - cd .. - rm -f ${IMGDEPLOYDIR}/${IMAGE_NAME}.flasher.tar.gz - tar czhf ${IMGDEPLOYDIR}/${IMAGE_NAME}.flasher.tar.gz tegraflash - ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz +tegraflash_custom_post() { + cat > prepare-image.sh <<END +#!/bin/sh -e +if [ ! -e "${IMAGE_BASENAME}.img" ]; then + xz -dc ../${IMAGE_LINK_NAME}.wic.xz | dd of=${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} iflag=fullblock skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024) +fi +echo "Flash image ready" +END + chmod +x prepare-image.sh + rm ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} } |