From patchwork Tue Feb 14 14:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 19529 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 1B371C64ED6 for ; Tue, 14 Feb 2023 14:54:05 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.8830.1676386435768877496 for ; Tue, 14 Feb 2023 06:53:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=pZeA1noz; 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 31EErrm3101578; Tue, 14 Feb 2023 08:53:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676386433; bh=TUPC9inbSw3m3u+jOCe5c4H85Ga2jvPCfr/Sd41vAbk=; h=From:To:CC:Subject:Date; b=pZeA1noz/mjfD4Da5Ik/84205EtmvMlpeMPTvnh06sCSDzkVNYciHk4qvE6GI30UQ 8vuSlm0lr6WYoiA/nW7iHMlqsKCk8S5um3/ykJSzJU8n8Y8W9U6FWwyGwskkeG+zKr BvUVW+8QSP1PoT/cMDE0eeeGFLYK+4mf/M1Z8rZs= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31EErrln076686 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 14 Feb 2023 08:53:53 -0600 Received: from DLEE111.ent.ti.com (157.170.170.22) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 14 Feb 2023 08:53:53 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 08:53:53 -0600 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 31EErqPd048291; Tue, 14 Feb 2023 08:53:52 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 1/4] u-boot-ti: Do not depend on DM firmware for R5 builds Date: Tue, 14 Feb 2023 08:53:49 -0600 Message-ID: <20230214145352.12093-1-afd@ti.com> X-Mailer: git-send-email 2.39.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 ; Tue, 14 Feb 2023 14:54:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15838 This is not needed as the R5 builds do not use the firmware and can cause issues as ti-rtos-firmware does not handle MULTICONFIG well. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index ae87ec6a..866c0314 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -33,11 +33,11 @@ PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/b PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware" PACKAGECONFIG:append:aarch64 = " atf optee" -PACKAGECONFIG:append:j721e = " dm" -PACKAGECONFIG:append:j7200 = " dm" -PACKAGECONFIG:append:j721s2 = " dm" -PACKAGECONFIG:append:j784s4 = " dm" -PACKAGECONFIG:append:am62xx = " dm" +PACKAGECONFIG:append:aarch64:j721e = " dm" +PACKAGECONFIG:append:aarch64:j7200 = " dm" +PACKAGECONFIG:append:aarch64:j721s2 = " dm" +PACKAGECONFIG:append:aarch64:j784s4 = " dm" +PACKAGECONFIG:append:aarch64:am62xx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" From patchwork Tue Feb 14 14:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 19532 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 0F4D6C05027 for ; Tue, 14 Feb 2023 14:54:05 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.8951.1676386434941286196 for ; Tue, 14 Feb 2023 06:53:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=J1GY58ix; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 31EErr8h095438; Tue, 14 Feb 2023 08:53:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676386433; bh=78C+N6/P2HOQzzXOk8Cb3+H1K5WDvp/wSEU8llncmx0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=J1GY58ix4JQAWSENb6FXLh26rl3gbulJ3RTt84crKor4Pb/h6ywEMuwksEp7Qetu7 OwVEoEMLxzP/EMqKihbYBNO65pDX9c5lDC9kOfAVHzKRSKOeYnOkkN8njvDAKj21jV w5I9Sa6fxJY3Ys8qfyGRNAEmGESazEEjubWC95Jg= Received: from DLEE101.ent.ti.com (dlee101.ent.ti.com [157.170.170.31]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31EErrZx076689 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 14 Feb 2023 08:53:53 -0600 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 14 Feb 2023 08:53:53 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 08:53:53 -0600 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 31EErqPe048291; Tue, 14 Feb 2023 08:53:53 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 2/4] conf: machine: Add proper SOC_FAMILY for R5 builds Date: Tue, 14 Feb 2023 08:53:50 -0600 Message-ID: <20230214145352.12093-2-afd@ti.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214145352.12093-1-afd@ti.com> References: <20230214145352.12093-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 ; Tue, 14 Feb 2023 14:54:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15835 Having our SOC_FAMILY set to our SoC name can be useful in recipes that need SoC specific configuration. Add SoC names. Setting the revision and security type is less useful here and not used. Remove that while here. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf | 2 +- meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 2 +- meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf | 2 +- meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf | 1 - meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf | 1 - meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 1 + 17 files changed, 15 insertions(+), 5 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 724a8d4a..2fb43256 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am62xx" SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index ca4ced5a..14246300 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am62xx" SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf index 50bf6a07..e6a1a9d7 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf @@ -5,7 +5,7 @@ # Booting GP requires different SYSFW, the rest is handled at runtime require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-gp" +SOC_FAMILY:append = ":am64xx" SYSFW_SOC = "am64x" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf index 42ddbb4c..29d000ef 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf @@ -5,7 +5,7 @@ # 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" +SOC_FAMILY:append = ":am64xx" SYSFW_SOC = "am64x_sr2" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf index a1c2b3e6..37457f00 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf @@ -5,7 +5,7 @@ # 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" +SOC_FAMILY:append = ":am64xx" SYSFW_SOC = "am64x_sr2" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf index e74dd3ab..09625c51 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf @@ -5,7 +5,6 @@ # Booting SR2 requires different SYSFW, the rest is handled at runtime require conf/machine/am65xx-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" SYSFW_SOC = "am65x_sr2" SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index a484e444..f8afad9b 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM65xx EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am65xx" SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf index ff1645e4..90ad313b 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf @@ -5,7 +5,6 @@ # Booting SR2 requires different SYSFW, the rest is handled at runtime require conf/machine/am65xx-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" SYSFW_SOC = "am65x_sr2" SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index d9041c9d..49983ba9 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am65xx" SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 21b8702b..d0694122 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j721e" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" diff --git a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf index 68061883..4cd6accf 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J7200 EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j7200" SYSFW_SOC = "j7200" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf index 3fe06e74..c3584193 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j7200" SYSFW_SOC = "j7200_sr2" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index 9544cdb6..678b79b1 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J721e EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j721e" SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 56312c0c..d7f0cfcc 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j721e" SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf index 508e96e5..7fb6ef28 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J721S2 EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j721s2" SYSFW_SOC = "j721s2" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf index a4d51904..fa1284c3 100644 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j721s2" SYSFW_SOC = "j721s2" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf index 04feebc6..37dad149 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core) require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":j784s4" SYSFW_SOC = "j784s4" SYSFW_CONFIG = "evm" From patchwork Tue Feb 14 14:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 19531 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 27879C6379F for ; Tue, 14 Feb 2023 14:54:05 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.8828.1676386435250612486 for ; Tue, 14 Feb 2023 06:53:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=aNg0z0ka; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 31EErs9s101077; Tue, 14 Feb 2023 08:53:54 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676386434; bh=ILpbF1b3J1Q9F45u1q180TU0TTRmszIa3whEs4U5qD8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=aNg0z0kauEsgYCR10zN+E2vXMeTeONZN3rJN/wMMDhuQJUCGZgd7jf7/uwlTMuA0h YZF8QK1Pvuk6kgo4g77CD0siv8T053bH2ahrXEhcW4PThHXM0DuiRdi4pnjd+wHOZm hiELEJ+o9Pofblev+TqE8QCWdnTHiUtj12AEFT/s= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31EErsjN033598 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 14 Feb 2023 08:53:54 -0600 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 14 Feb 2023 08:53:53 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 08:53:53 -0600 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 31EErqPf048291; Tue, 14 Feb 2023 08:53:53 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 3/4] ti-sci-fw: Use SOC_FAMILY to select boot and sysfw type Date: Tue, 14 Feb 2023 08:53:51 -0600 Message-ID: <20230214145352.12093-3-afd@ti.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214145352.12093-1-afd@ti.com> References: <20230214145352.12093-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 ; Tue, 14 Feb 2023 14:54:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15836 Use the new SOC_FAMILY SoC information to select boot type and SYSFW/TIFS split. This removes the need to add to this recipe for each new board, only for new SoCs. Signed-off-by: Andrew Davis --- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 578f56b8..e9c90a76 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -4,14 +4,8 @@ export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secd include recipes-ti/includes/ti-paths.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" -DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:am65xx-evm-k3r5-sr2 = "virtual/bootloader" -DEPENDS:remove:am65xx-hs-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" -DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" -DEPENDS:remove:beaglebone-ai64-k3r5 = "virtual/bootloader" +DEPENDS:remove:am65xx = "virtual/bootloader" +DEPENDS:remove:j721e = "virtual/bootloader" DEPENDS:append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" CLEANBROKEN = "1" @@ -31,17 +25,11 @@ SYSFW_SUFFIX ?= "unknown" SYSFW_CONFIG ?= "unknown" SYSFW_PREFIX = "sci" -SYSFW_PREFIX:j721e-evm-k3r5 = "fs" -SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs" -SYSFW_PREFIX:beaglebone-ai64-k3r5 = "fs" -SYSFW_PREFIX:j7200-evm-k3r5 = "fs" -SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" -SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j784s4-evm-k3r5 = "fs" -SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" -SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" +SYSFW_PREFIX:j721e = "fs" +SYSFW_PREFIX:j7200 = "fs" +SYSFW_PREFIX:j721s2 = "fs" +SYSFW_PREFIX:j784s4 = "fs" +SYSFW_PREFIX:am62xx = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" @@ -65,14 +53,8 @@ EXTRA_OEMAKE = "\ CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ " -EXTRA_OEMAKE:remove:am65xx-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5-sr1-1 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:beaglebone-ai64-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:am65xx = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ From patchwork Tue Feb 14 14:53:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 19530 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 135AFC64EC7 for ; Tue, 14 Feb 2023 14:54:05 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.8829.1676386435449743567 for ; Tue, 14 Feb 2023 06:53:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=swrU1YqM; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 31EErs2L101082; Tue, 14 Feb 2023 08:53:54 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676386434; bh=a3kJmEwpVdnL6tkAejHERTgRw+I/36IAZx4GBZ6VGo8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=swrU1YqMdn3VHeoPyJyzsfXxZQKzzM24uLEjTskPIo2c5XVFwcLj+mnOJSMGcM3Jw 9+ay9qQokpPLyZDrRAgMyE8GVanEl/f3qQ6o2W2+LFcUQFMZAy9J6gnpOAWzkGyABQ FSrlGPlzi0sM9Tsl8wTwF8pbZrh3d/TLmzqp2Kns= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31EErsth033605 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 14 Feb 2023 08:53:54 -0600 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 14 Feb 2023 08:53:54 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 14 Feb 2023 08:53:54 -0600 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 31EErqPg048291; Tue, 14 Feb 2023 08:53:53 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 4/4] ti-sci-fw: Make split TIFS and DM the default Date: Tue, 14 Feb 2023 08:53:52 -0600 Message-ID: <20230214145352.12093-4-afd@ti.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214145352.12093-1-afd@ti.com> References: <20230214145352.12093-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 ; Tue, 14 Feb 2023 14:54:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15837 Going forward, the split TIFS/DM is going to be more common. Only AM65x and AM64x still use the combined SYSFW. Set SYSFW_PREFIX for split "fs" firmware and override only for the two combined "sci" platforms. This makes it easier to add new platforms as no change will be needed to this recipe. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index e9c90a76..70311cbb 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -24,12 +24,9 @@ SYSFW_SOC ?= "unknown" SYSFW_SUFFIX ?= "unknown" SYSFW_CONFIG ?= "unknown" -SYSFW_PREFIX = "sci" -SYSFW_PREFIX:j721e = "fs" -SYSFW_PREFIX:j7200 = "fs" -SYSFW_PREFIX:j721s2 = "fs" -SYSFW_PREFIX:j784s4 = "fs" -SYSFW_PREFIX:am62xx = "fs" +SYSFW_PREFIX = "fs" +SYSFW_PREFIX:am65xx = "sci" +SYSFW_PREFIX:am64xx = "sci" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"