From patchwork Wed Sep 7 16:03:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 12444 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 90F51C54EE9 for ; Wed, 7 Sep 2022 16:03:26 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web12.516.1662566599310810967 for ; Wed, 07 Sep 2022 09:03:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=IqxI/6Za; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 287G3GFe095536; Wed, 7 Sep 2022 11:03:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1662566596; bh=8rrMM+eMcOeOD8cuwSDhdd7Avy++PQbaek1PizAjw7s=; h=From:To:CC:Subject:Date; b=IqxI/6ZakR4cWTQZ+GlslPh38l00Fg/Lb5p4JM5iQacNjbMNRTZrhEgBa58fWTrRR o7QqTG2TOivdpBo4Q9XP+yWe/eOAjw3ab3Iei+1XIYkyXdGm7pbuAdsy20C+dmRL4t MPmYRY230h96L4PrC/MZgAJZ+pgOojpaicfxH1LA= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 287G3G4A074724 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Sep 2022 11:03:16 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Wed, 7 Sep 2022 11:03:16 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6 via Frontend Transport; Wed, 7 Sep 2022 11:03:15 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 287G3FQL031242; Wed, 7 Sep 2022 11:03:15 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Anand Gadiyar , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH v2 1/2] conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default Date: Wed, 7 Sep 2022 11:03:14 -0500 Message-ID: <20220907160315.24535-1-afd@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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, 07 Sep 2022 16:03:26 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15003 AM64x devices will only be available as SR2.0 HS-FS. Set this as the default type provided by the SDK. To allow SR2.0 HS-SE to continue to boot, like we did with GP, we add an extra machine to build SR2.0 HS-SE SYSFW. To use on SR2.0 HS-SE boards simply switch out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am64x_sr2-hs-evm.bin tiboot3.bin Signed-off-by: Andrew Davis --- conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 ------------- conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 14 +++++++++++++ conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf | 20 +++++++++++++++++++ conf/machine/am64xx-evm.conf | 8 +++++++- conf/machine/include/am64xx.inc | 6 +++--- conf/multiconfig/k3r5-sr2-hs-fs.conf | 3 +++ .../{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} | 2 +- 7 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf create mode 100644 conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf create mode 100644 conf/multiconfig/k3r5-sr2-hs-fs.conf rename conf/multiconfig/{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} (55%) diff --git a/conf/machine/am64xx-evm-k3r5-hs-se.conf b/conf/machine/am64xx-evm-k3r5-hs-se.conf deleted file mode 100644 index 7cab7d15..00000000 --- a/conf/machine/am64xx-evm-k3r5-hs-se.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) - -# Booting HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY_append = ":k3r5-hs-se" - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..1139fe4a --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core) + +# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr2-hs-fs" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..f2aeca6d --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core) + +# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr2-hs-se" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index f150f532..d9afb08e 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -6,8 +6,14 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" -# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index becc79d4..0b9a3e59 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -14,9 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -BBMULTICONFIG = "k3r5-hs-se" -do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-sr2-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/conf/multiconfig/k3r5-sr2-hs-fs.conf b/conf/multiconfig/k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..8e6b5c68 --- /dev/null +++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5-sr2.conf + +MACHINE_append = "-hs-fs" diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-sr2-hs-se.conf similarity index 55% rename from conf/multiconfig/k3r5-hs-se.conf rename to conf/multiconfig/k3r5-sr2-hs-se.conf index 701f8e88..69e6d0c8 100644 --- a/conf/multiconfig/k3r5-hs-se.conf +++ b/conf/multiconfig/k3r5-sr2-hs-se.conf @@ -1,3 +1,3 @@ -require k3r5.conf +require k3r5-sr2.conf MACHINE_append = "-hs-se" From patchwork Wed Sep 7 16:03:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 12443 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 91D7AC6FA86 for ; Wed, 7 Sep 2022 16:03:26 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web08.559.1662566599376794885 for ; Wed, 07 Sep 2022 09:03:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=IIXLQtgU; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 287G3GM8095542; Wed, 7 Sep 2022 11:03:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1662566596; bh=3jNZ0MGWe1QucOvJLjYJ5F9pw+xxboB4FL1BFIz9QQQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=IIXLQtgUvqDtjPCK4Vazr3oFiJpMXi60k8dhvvex4f6NWusu7ayqwY/ckITRj+l3f PdBP9B5tcKRAzZmvALv1TyOhd3Rgfw+bPZtfLKPwlfXgxkRYAZfirg3PdnySy22R9x muU1Ugo0hvSEtOocCgV+m6U1g4hy4K2roHL41ucg= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 287G3GuE035777 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Sep 2022 11:03:16 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Wed, 7 Sep 2022 11:03:16 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) 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.6 via Frontend Transport; Wed, 7 Sep 2022 11:03:16 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 287G3FQM031242; Wed, 7 Sep 2022 11:03:16 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Anand Gadiyar , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH v2 2/2] conf: machine: am64xx: Move multi-config targets into base SoC include Date: Wed, 7 Sep 2022 11:03:15 -0500 Message-ID: <20220907160315.24535-2-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220907160315.24535-1-afd@ti.com> References: <20220907160315.24535-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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, 07 Sep 2022 16:03:26 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15004 The supported device types depends on the SoC, not on any specific board or EVM. Any board can be populated with any of the 3 supported AM64x types. Move these into the AM64x common include. Signed-off-by: Andrew Davis --- Changes from v1: - Disable rewrite detection in git format-patch conf/machine/am64xx-evm.conf | 12 ------------ conf/machine/include/am64xx.inc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index d9afb08e..c6ba2a87 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -5,15 +5,3 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -BBMULTICONFIG += "k3r5-sr2-hs-se" -IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 0b9a3e59..913d95e6 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -14,10 +14,23 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS BBMULTICONFIG = "k3r5-sr2-hs-fs" do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" + TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" OPTEEOUTPUTMACHINE = "k3"