From patchwork Wed Jul 2 01:46:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 66049 X-Patchwork-Delegate: reatmon@ti.com 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 1CEEFC83F04 for ; Wed, 2 Jul 2025 01:46:30 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.13490.1751420781011687804 for ; Tue, 01 Jul 2025 18:46:21 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 6BA3E40CC8; Wed, 2 Jul 2025 01:46:20 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LYR7wrLQCV4z; Wed, 2 Jul 2025 01:46:20 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 471FF40C8E; Wed, 2 Jul 2025 01:46:19 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 9A88816B1FD; Tue, 1 Jul 2025 21:46:17 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH v2 4/6] meta-ti-bsp, meta-beagle: switch to the new FIT image wrapper Date: Tue, 1 Jul 2025 21:46:14 -0400 Message-Id: <20250702014616.100136-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250702014616.100136-1-denis@denix.org> References: <20250702014616.100136-1-denis@denix.org> MIME-Version: 1.0 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 ; Wed, 02 Jul 2025 01:46:30 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18754 From: Denys Dmytriyenko Switch all kernel recipes and K3 based platforms to use the new FIT image wrapper functionality. Update FIT default DTB entry to not contain vendor dubdir, as it is now handled through a conf prefix. Signed-off-by: Denys Dmytriyenko --- v2 - FIT default DTBs don't need vendor subdir due to conf prefix meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb | 2 +- meta-ti-bsp/conf/machine/am62axx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62dxx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62pxx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 2 +- meta-ti-bsp/conf/machine/include/k3.inc | 5 ++--- meta-ti-bsp/conf/machine/include/ti-falcon.inc | 3 ++- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb index 067c9ddf..320ee60b 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" COMPATIBLE_MACHINE = "beagle.*" -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb index 6e221d1b..e11675c5 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*" -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb index cc7a56ac..28b6735b 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" COMPATIBLE_MACHINE = "beagle.*" -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index faeb34a9..b83edeae 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -20,6 +20,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am62a7-sk.dtb" UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm.conf b/meta-ti-bsp/conf/machine/am62dxx-evm.conf index 1e41c53c..e1ef260b 100644 --- a/meta-ti-bsp/conf/machine/am62dxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf @@ -11,7 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \ KERNEL_DEVICETREE = "" -FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am62d2-evm.dtb" UBOOT_MACHINE = "am62dx_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index 09f0d1fb..cdde69eb 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -21,7 +21,7 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb" UBOOT_MACHINE = "am62px_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index c826439b..298fc170 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb" UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index 37f4a644..32e88051 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -23,6 +23,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am62-lp-sk.dtb" UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf index 2ca2cbdb..57cbaee2 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -13,7 +13,7 @@ KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ " -FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb" +FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb" UBOOT_MACHINE = "am62xsip_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index ec9a8944..6b4ae2ad 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -9,8 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image fitImage" -KERNEL_CLASSES += "kernel-fitimage-deprecated" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x81000000" @@ -30,7 +29,7 @@ FIT_SIGN_ALG ?= "rsa4096" EXTRA_IMAGEDEPENDS += "virtual/bootloader" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image ti-kernel-fitimage" TFA_PLATFORM = "k3" diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc index 252fb28a..590e5bc6 100644 --- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc +++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc @@ -1,5 +1,6 @@ IMAGE_INSTALL:append = " u-boot-ti-staging-falcon" -KERNEL_CLASSES:remove = "kernel-fitimage-deprecated" +KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage" KERNEL_CLASSES += "kernel-fitimage-legacyhs" UBOOT_DTB_LOADADDRESS = "0x88000000" UBOOT_LOADADDRESS = "0x82000000" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 388110ad..4c740678 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Mainline Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 97fa6463..ac034c2c 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit ti-secdev -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index 15ff3311..37ae38cb 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit ti-secdev -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb index 4714bba1..07cad78d 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit ti-secdev -inherit kernel_deprecated +inherit kernel require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc