From 433bdd3ed130126a54268e4f648fc0e2e03e47d1 Mon Sep 17 00:00:00 2001
From: Ari Parkkila <ari.parkkila@qt.io>
Date: Wed, 22 Feb 2023 12:22:06 +0200
Subject: tegra: combine tegraflash_custom_post scripts

tegraflash_custom_post in image_types_tegra_b2qt.bbclass
updated to match updated meta-tegra layer functionality.

Fixes: QTBUG-111256
Change-Id: If15825484866522bad88e15797b885255a012930
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7bd73053a604b15b01c49491ed96625e942dbf94)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 meta-boot2qt/classes/image_types_tegra_b2qt.bbclass | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass
index a4c03d11..92268fe1 100644
--- a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass
+++ b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass
@@ -27,21 +27,6 @@
 ##
 ############################################################################
 
-# create flash package that utilizes the SD card image
-tegraflash_custom_post:tegra186() {
-    cat > prepare-image.sh <<END
-#!/bin/sh -e
-if [ ! -e "${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}" ]; 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)
-    ./mksparse -v --fillpattern=0 ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
-    rm -f ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
-fi
-echo "Flash image ready"
-END
-    chmod +x prepare-image.sh
-    rm ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
-}
-
 tegraflash_custom_post() {
     cat > prepare-image.sh <<END
 #!/bin/sh -e
-- 
cgit v1.2.3