jetson: remove wic image from qbsp binary

Since the image flashed to jetson family board doesn't rely on the wic
image, remove it from output and qbsp content list.
Remove some unused rootspec and wks file.
Remove image type tegra_b2qt as is obsolete now as well.

Change-Id: I094ecc35505f1cef1850c2b44a1887420b49d564
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b493dd6c6514f8424d63554aae8a396c794f0f2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 0 insertions, 61 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index ae88dffa..15f7cd59 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -27,27 +27,9 @@
 ##
 ############################################################################
 
-# without the distro_bootpart that's not supported by stock u-boot
-KERNEL_ROOTSPEC = "root=/dev/mmcblk${devnum}p1 rw rootwait"
-KERNEL_ROOTSPEC:jetson-nano-2gb-devkit = "root=/dev/mmcblk0p1 rw rootwait"
-KERNEL_ROOTSPEC:jetson-nano-devkit = "root=/dev/mmcblk0p1 rw rootwait"
-
-INITRAMFS_MAXSIZE = "165888"
-IMAGE_ROOTFS_ALIGNMENT = "1024"
-UBOOT_SUFFIX = "bin"
-
-IMAGE_FSTYPES += "wic.xz"
-WKS_FILE = "tegra-bootdisk.wks.in"
-
 DEPLOY_CONF_NAME:jetson-agx-xavier-devkit = "NVIDIA Jetson AGX Xavier Development Kit"
 
-DEPLOY_CONF_IMAGE_TYPE = "wic.xz"
-
-IMAGE_CLASSES += "image_types_tegra_b2qt"
-
 QBSP_IMAGE_CONTENT += "\
-    ${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} \
-    ${IMAGE_LINK_NAME}.conf \
     ${IMAGE_LINK_NAME}.info \
     ${IMAGE_LINK_NAME}.tegraflash.tar.gz \
     "
diff --git a/meta-boot2qt-distro/wic/tegra-bootdisk.wks.in b/meta-boot2qt-distro/wic/tegra-bootdisk.wks.in
deleted file mode 100644
index 24ad2865..00000000
--- a/meta-boot2qt-distro/wic/tegra-bootdisk.wks.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# template for tegra SD card boot disk
-part / --source rootfs --fstype=${IMAGE_TEGRAFLASH_FS_TYPE} --label root --align ${IMAGE_ROOTFS_ALIGNMENT} --overhead-factor 1.0
-bootloader --ptable gpt
diff --git a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass
deleted file mode 100644
index 64051d28..00000000
--- a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-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_BASENAME}.${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}
-}