From patchwork Fri Jun 27 06:04:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshul Dalal X-Patchwork-Id: 65698 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 85902C7EE2A for ; Fri, 27 Jun 2025 06:05:04 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web11.7053.1751004300422444211 for ; Thu, 26 Jun 2025 23:05:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=RwttYEBT; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: anshuld@ti.com) Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55R64xZY1945131 for ; Fri, 27 Jun 2025 01:04:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751004299; bh=eY/+DdtNWvQlHjY3IomiAH4lBzeHjTayk2Rw0x2JEi0=; h=From:To:CC:Subject:Date; b=RwttYEBT4N4xpbS4IOIYqG8SM/wmfJN6aJrPggteG0zzdL+uiLzvv0nc/Sv0FokTU 2V6hZ9jVAkdx8dS4gAq8lbyoScEnsH6JaLNT4jZ4M6Gztv080qOnBCEaz/5j9seBhq VHcjVV9u9aoqoy4ANP33yNrSd4MzuFQssgtldIRw= Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55R64xev2691646 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL) for ; Fri, 27 Jun 2025 01:04:59 -0500 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Fri, 27 Jun 2025 01:04:59 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Fri, 27 Jun 2025 01:04:59 -0500 Received: from localhost (dhcp-172-24-227-250.dhcp.ti.com [172.24.227.250]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55R64wH22307000; Fri, 27 Jun 2025 01:04:59 -0500 From: Anshul Dalal To: CC: Anshul Dalal , , , , Subject: [PATCH v1 1/2] conf: machine: k3: update fitImage load address Date: Fri, 27 Jun 2025 11:34:13 +0530 Message-ID: <20250627060416.639661-1-anshuld@ti.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Fri, 27 Jun 2025 06:05:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18698 In yocto, the UBOOT_ENTRYPOINT and UBOOT_*LOADADDRESS variables specify the entry point and load addresses for the kernel image and the DTB when creating the fitImage[1]. Currently the load address for the kernel is set to 0x81000000 and 0x83000000 for the DTB for all k3 platforms. However the region 0x80080000 to 0x81880000 is reserved for OPTEE on am62xxsip-evm, leading to boot failure[2] when using the fitImage. This patch fixes the issue by changing the addresses to 0x82000000 for kernel and 0x88000000 for the DTB. This also allows us to load kernel images > 32MiB in size when not using initrd while also making the falcon and standard boot addresses consistent. [1]: https://docs.yoctoproject.org/ref-manual/variables.html#term-UBOOT_ENTRYPOINT [2]: https://raw.githubusercontent.com/ArchUsr64/ti_boot_logs/HEAD/am62xxsip-evm/failures/fitImage_load_addr_issue.log Signed-off-by: Anshul Dalal --- meta-ti-bsp/conf/machine/include/k3.inc | 8 ++++---- meta-ti-bsp/conf/machine/include/ti-falcon.inc | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 9b85f867..28785173 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -13,12 +13,12 @@ KERNEL_IMAGETYPES = "Image fitImage" KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" -UBOOT_ENTRYPOINT = "0x81000000" -UBOOT_LOADADDRESS = "0x81000000" +UBOOT_ENTRYPOINT = "0x82000000" +UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTB_LOADADDRESS = "0x88000000" +UBOOT_DTBO_LOADADDRESS = "0x88080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin" diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc index 0b938470..84a62b22 100644 --- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc +++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc @@ -1,6 +1,4 @@ IMAGE_INSTALL:append = " u-boot-ti-staging-falcon" KERNEL_CLASSES:remove = "kernel-fitimage" KERNEL_CLASSES += "kernel-fitimage-legacyhs" -UBOOT_DTB_LOADADDRESS = "0x88000000" -UBOOT_LOADADDRESS = "0x82000000" FIT_KERNEL_COMP_ALG = "none" From patchwork Fri Jun 27 06:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshul Dalal X-Patchwork-Id: 65697 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 86880C7EE39 for ; Fri, 27 Jun 2025 06:05:04 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web11.7054.1751004301727584380 for ; Thu, 26 Jun 2025 23:05:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=adYtnKbC; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: anshuld@ti.com) Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55R6512o1945137 for ; Fri, 27 Jun 2025 01:05:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751004301; bh=CjjwwZ8i2fsDR+pDMWBsUxV8kKQzgtfy2SAOl2rN9y8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=adYtnKbCCtmjcMs7dSu9eErP15pU334byfRJKevXKYjgYPMrKvq0NiOohee3ikpdJ YO9/0U/Utxu7rhg/G5RwzmtP+F5oEILjKfzsuR0HTHTJrHbCFsVqH7albNtIV24vWy rNA9HGesM4y8XLMYtthd+My9PbwkgJYE3qcG3Aqs= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55R651mt2961600 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL) for ; Fri, 27 Jun 2025 01:05:01 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Fri, 27 Jun 2025 01:05:00 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Fri, 27 Jun 2025 01:05:00 -0500 Received: from localhost (dhcp-172-24-227-250.dhcp.ti.com [172.24.227.250]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55R650ds2572716; Fri, 27 Jun 2025 01:05:00 -0500 From: Anshul Dalal To: CC: Anshul Dalal , , , , Subject: [PATCH v1 2/2] conf: machine: move UBOOR_*ADDRESS to top level ti-soc Date: Fri, 27 Jun 2025 11:34:14 +0530 Message-ID: <20250627060416.639661-2-anshuld@ti.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250627060416.639661-1-anshuld@ti.com> References: <20250627060416.639661-1-anshuld@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Fri, 27 Jun 2025 06:05:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18699 Since all k3 and legacy platforms share common load addresses for kernel and initrd in the fitImage, move them to top level ti-soc.inc. No functional change is intended from this patch. Signed-off-by: Anshul Dalal --- meta-ti-bsp/conf/machine/am335x-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/include/k3.inc | 4 ---- meta-ti-bsp/conf/machine/include/ti-soc.inc | 6 ++++++ 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf index ca102961..652496c2 100644 --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf @@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc" UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config" UBOOT_CONFIG[mmc] = "am335x_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - # FIT image for legacy secure devices KERNEL_CLASSES += " kernel-fitimage-legacyhs" KERNEL_IMAGETYPES += " fitImage" diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index 632b4995..fde38d39 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf UBOOT_MACHINE = "am43xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-am43xx" OPTEEFLAVOR = "am43xx" diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 4f36a847..fcdc5c0b 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf UBOOT_MACHINE = "am57xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-am57xx" OPTEEFLAVOR = "am57xx" OPTEEPAGER = "y" diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index 8e57a154..37ffef31 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf UBOOT_MACHINE = "dra7xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-dra7xx" OPTEEFLAVOR = "dra7xx" OPTEEPAGER = "y" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 28785173..feb5a543 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -13,10 +13,6 @@ KERNEL_IMAGETYPES = "Image fitImage" KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" UBOOT_DTB_LOADADDRESS = "0x88000000" UBOOT_DTBO_LOADADDRESS = "0x88080000" UBOOT_DTBO_OFFSET = "0x00010000" diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 5d77e719..5125856f 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -3,6 +3,12 @@ SOC_FAMILY = "ti-soc" require conf/machine/include/soc-family.inc +# kernel, initrd load addresses for the fitImage in all TI platforms +UBOOT_ENTRYPOINT = "0x82000000" +UBOOT_LOADADDRESS = "0x82000000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" + # TI platforms all use devicetrees with overlays MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1"