From patchwork Tue Jun 3 08:23:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 64135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E968C61DB8 for ; Tue, 3 Jun 2025 08:24:36 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web10.6268.1748939070932120982 for ; Tue, 03 Jun 2025 01:24:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=adrian.freihofer@siemens.com header.s=fm2 header.b=fJfaZoeB; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-1329275-20250603082429df6a3042b370e741b1-bdhhk0@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250603082429df6a3042b370e741b1 for ; Tue, 03 Jun 2025 10:24:29 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=adrian.freihofer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=6q86jXRFxKPhX1jBCIhhlWf1dmRpDQ9Bg5Irfo5/ZVk=; b=fJfaZoeBXrpTNW1br4YGxnLiMIc41hwKg2ax9PKxsZk7xryA3qI343nGtTCGeZ2I3QzHUe Lv5tLeaEtSRFhk+LQGxgZfF7aoZ+21rvGN7XHu8b3jqfUfizTSKpLQUcH8c02RNhZXP6dAy8 /gNz92yVnrCQCcvBLuElZrCtTxF323qn9llG8PWZ/GVaIkOGa1TbmPsccFifJRVfWtsMpQld Bq5w+lxpVyGcqPQlLo+YhF3YDP9Ym1E+u3fUa2jYktKQq5kKQBuIlX8gjIhC5gIFhJeyIvCi iaJrYcMeY1mHIoQledOUl0Is7cvGY6w9D+5z4oLuKs/4v27GSp7dxe2A==; From: AdrianF To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v7 05/20] oe-selftest: fitimage: test FIT_CONF_DEFAULT_DTB Date: Tue, 3 Jun 2025 10:23:16 +0200 Message-ID: <20250603082419.409564-6-adrian.freihofer@siemens.com> In-Reply-To: <20250603082419.409564-1-adrian.freihofer@siemens.com> References: <20250603082419.409564-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1329275:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 03 Jun 2025 08:24:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217769 From: Adrian Freihofer Add some test coverage for non default FIT_CONF_DEFAULT_DTB. Signed-off-by: Adrian Freihofer --- meta/lib/oeqa/selftest/cases/fitimage.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py b/meta/lib/oeqa/selftest/cases/fitimage.py index 812b34fab47..8a3eb7f8c11 100644 --- a/meta/lib/oeqa/selftest/cases/fitimage.py +++ b/meta/lib/oeqa/selftest/cases/fitimage.py @@ -380,6 +380,7 @@ class KernelFitImageTests(FitImageTestCase): """ internal_used = { 'DEPLOY_DIR_IMAGE', + 'FIT_CONF_DEFAULT_DTB', 'FIT_CONF_PREFIX', 'FIT_DESC', 'FIT_HASH_ALG', @@ -526,10 +527,14 @@ class KernelFitImageTests(FitImageTestCase): its_field_check.append("load = <%s>;" % uboot_rd_loadaddress) if uboot_rd_entrypoint: its_field_check.append("entry = <%s>;" % uboot_rd_entrypoint) - its_field_check += [ - # 'default = bb_vars['FIT_CONF_PREFIX'] + "1";', needs more work - 'kernel = "kernel-1";', - ] + + fit_conf_default_dtb = bb_vars.get('FIT_CONF_DEFAULT_DTB') + if fit_conf_default_dtb: + fit_conf_prefix = bb_vars.get('FIT_CONF_PREFIX', "conf-") + its_field_check.append('default = "' + fit_conf_prefix + fit_conf_default_dtb + '";') + + its_field_check.append('kernel = "kernel-1";') + if initramfs_image and initramfs_image_bundle != "1": its_field_check.append('ramdisk = "ramdisk-1";') @@ -773,6 +778,7 @@ UBOOT_SIGN_ENABLE = "1" UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" UBOOT_SIGN_KEYNAME = "dev" UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" +FIT_CONF_DEFAULT_DTB = "am335x-bonegreen.dtb" """ config = self._config_add_uboot_env(config) self.write_config(config)