From patchwork Thu Feb 9 18:31:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinthu Raja M X-Patchwork-Id: 19289 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 7632BC61DA4 for ; Thu, 9 Feb 2023 18:31:29 +0000 (UTC) Received: from egress-ip4b.ess.de.barracuda.com (egress-ip4b.ess.de.barracuda.com [18.185.115.208]) by mx.groups.io with SMTP id smtpd.web11.24874.1675967483968722447 for ; Thu, 09 Feb 2023 10:31:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@mistralsolutions.com header.s=google header.b=gl3Zm1rp; spf=pass (domain: mistralsolutions.com, ip: 18.185.115.208, mailfrom: sinthu.raja@mistralsolutions.com) Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx-outbound16-204.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 09 Feb 2023 18:31:20 +0000 Received: by mail-pg1-f197.google.com with SMTP id 201-20020a6300d2000000b004ccf545f44fso1436408pga.12 for ; Thu, 09 Feb 2023 10:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistralsolutions.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5hbRxLKRxagjRYkVrEV8wkiP7PwQDeLMNRbGaLiwzdg=; b=gl3Zm1rpbDc/zuWkpDEtGiuIpK6bk6ENm1ubhVKWGuEh/fU+KzwJkh96g8awUX/0SH mOvKSoMdjBIADIqpdE42+2sBKsDBVrY8pw7Whf62QdaRsxsDqq1GTiFg7/EG2HmOq7G/ dVtjApgGhYNq/OsjZz7jC1p85kNwdsdLatRgI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5hbRxLKRxagjRYkVrEV8wkiP7PwQDeLMNRbGaLiwzdg=; b=Gco9OT5IJxctTFW4j4LRO9TacIiOEpA13FnkDMOrxO4OdZEN0NUmO6isxj34zXwjFf PEvQdRpLlVad0nCde+GA6ClQ4MMr4a9B8dzAxaWeNSW99FmNREfACnC6Z0AHbtvkB7Ma IFsXfJAcJMWxQ2To1Nzvj/vq4KYDPiZvN3lotNfPFcVnouolldNxYzo/opDNhqts23Ro uI35qqN3ABgHtQ7GnLDY7728c60GsspTQwCoTzbw24XM9Dsqsl4d4ttex/puhv/GZ12N 2OfN/aEqTz0Kmkns2DE36C0yjY7i2K8c7z3f4zSkwmgrkBmDgjsBQmEQMN/cJyLzXxtk zQxw== X-Gm-Message-State: AO0yUKUR6pY44GWJhiH48jdYxRpiFyxsiP+QuLd6XXPRXlraxzJV54Ge CEoeBEqUn9vbQsJCSVa0BIpMNdAPlEzrptmaMgiMaVpmpPSlXK23Sa0JFQiyCjzlZZIRJyp9fW5 iB/crRRhOXHpkbJRxY/B6oiHc+xrtY8tkJXGatxqzILnCawe5WYZZYPwb9GCP/hs= X-Received: by 2002:aa7:9906:0:b0:5a8:68c0:560a with SMTP id z6-20020aa79906000000b005a868c0560amr717869pff.22.1675967477744; Thu, 09 Feb 2023 10:31:17 -0800 (PST) X-Google-Smtp-Source: AK7set/abs8ky7ufhDl58krgwMWGVkrJ8tqQ9sWPgLn951zMGFhnXy4bBq1nunrs2Lr2Xtk1dDDHXA== X-Received: by 2002:aa7:9906:0:b0:5a8:68c0:560a with SMTP id z6-20020aa79906000000b005a868c0560amr717838pff.22.1675967477131; Thu, 09 Feb 2023 10:31:17 -0800 (PST) Received: from localhost.localdomain ([49.207.192.121]) by smtp.gmail.com with ESMTPSA id d19-20020aa78153000000b00593fa670c88sm1756273pfn.57.2023.02.09.10.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:31:16 -0800 (PST) From: Sinthu Raja X-Google-Original-From: Sinthu Raja To: reatmon@ti.com, denys@ti.com, detheridge@ti.com Cc: meta-ti@lists.yoctoproject.org, Sinthu Raja Subject: [meta-ti][dunfell][PATCH V5] conf: machine: k3: Define RD, DTB and DTBO load address for FIT image Date: Fri, 10 Feb 2023 00:01:10 +0530 Message-Id: <20230209183110.8213-1-sinthu.raja@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-BESS-ID: 1675967480-304300-5382-24781-1 X-BESS-VER: 2019.1_20230201.1831 X-BESS-Apparent-Source-IP: 209.85.215.197 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.246032 [from cloudscan9-126.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_SC0_MISMATCH_TO META: Envelope rcpt doesn't match header 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS91090 scores of KILL_LEVEL=7.0 tests=BSF_SC0_MISMATCH_TO, BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 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 ; Thu, 09 Feb 2023 18:31:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15778 From: Sinthu Raja K3 platforms include the FIT image-based kernel by default. The bootloader loads the kernel and DTB from the FIT image. The DTB/DTBOs are added to the FIT image but the load address is not included in the image section of each DTB/DTBO. This load address is determined by the LOADADDRESS macros in the kernel-fitmage class. Hence, define the RD/DTB/DTBOs LOADADDRESS and OFFSET macros in the k3 common include, and remove those macros defined in the k3 board specific conf. Signed-off-by: Sinthu Raja Reviewed-by: Andrew Davis --- Change in V4 & V5: ================= - Update commit description, keep FIT as capitalized. Changes in V3: ============= Address review comments: - Update commit description. - Define UBOOT_RD_* in k3 common include. - Remove the UBOOT* defines from k3 board specific files. Changes in V2: ============= Address review comment: - Move the change to k3.inc as the FIT image is included as default image across all platforms V1: https://lists.yoctoproject.org/g/meta-ti/message/15754 V2: https://lists.yoctoproject.org/g/meta-ti/message/15768 V3: https://lists.yoctoproject.org/g/meta-ti/message/15776 conf/machine/am65xx-hs-evm.conf | 8 -------- conf/machine/include/k3.inc | 5 +++++ conf/machine/j7-hs-evm.conf | 8 -------- conf/machine/j7200-hs-evm.conf | 8 -------- conf/machine/j721s2-hs-evm.conf | 8 -------- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index ea1f8ff1..2c1256d0 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 81139571..611d5cce 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -21,6 +21,11 @@ KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_DTB_LOADADDRESS = "0x83000000" +UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin" SPL_BINARYNAME = "tispl.bin" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index bbfe6fcb..68d36d5f 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j7-evm.conf UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index ef7268b1..dc928974 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j7200-evm.conf UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf index 84db90bb..3d737f44 100644 --- a/conf/machine/j721s2-hs-evm.conf +++ b/conf/machine/j721s2-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j721s2-evm.conf UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img"