From patchwork Fri Jun 27 19:30:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 65773 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 41785C77B7F for ; Fri, 27 Jun 2025 19:30:09 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web11.1518.1751052606655949144 for ; Fri, 27 Jun 2025 12:30:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=BAPv1Trx; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from lelvem-sh01.itg.ti.com ([10.180.77.71]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55RJU5ZA2828576; Fri, 27 Jun 2025 14:30:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751052605; bh=d375Ei1aWfhDWH7s185gb2XePoH4flqkOHQWijmFaOc=; h=From:To:CC:Subject:Date; b=BAPv1Trxd3krNElp6fZDRES9pg4MfXiFUK0GUYNhzgN5oRZinm/Xe75NsNyvdZzyv jSdw86LtlSA1MjQAmPNQwXvb+eH6ljJvwivRyJEXpdlEWH94gCQsGLTD+MR1Dbos+r MLorroOtJkUu2AIQRg34kMcP8cRj7jl2yAOteneI= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelvem-sh01.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55RJU5Qu734987 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Fri, 27 Jun 2025 14:30:05 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE103.ent.ti.com (10.64.6.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 14:30:04 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE105.ent.ti.com (10.64.6.26) 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 14:30:04 -0500 Received: from lelvem-mr06.itg.ti.com ([10.249.42.149]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55RJU4l63330306; Fri, 27 Jun 2025 14:30:04 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][scarthgap/master][PATCH 1/2] meta-ti-bsp: conf: machine: Deploy all versions of tiboot3.bin Date: Fri, 27 Jun 2025 14:30:02 -0500 Message-ID: <20250627193003.575911-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 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 19:30:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18709 For some version of U-Boot some versions of tiboot3.bin were not available. This has since been fixed and now all versions of U-Boot that are supported here have all versions of tiboot3.bin. Deploy these all here. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/j7200.inc | 8 ++------ meta-ti-bsp/conf/machine/include/j721e.inc | 19 +++++++++---------- meta-ti-bsp/conf/machine/include/j722s.inc | 5 +---- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index 3cba71b6..e7ab409f 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -7,14 +7,10 @@ SOC_FAMILY:append = ":j7200" IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS -IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin" -IMAGE_SR1_HS_FS_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE -IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin" -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 30aa2a69..3a5a9af6 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -15,22 +15,21 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" -IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" -IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" +IMAGE_SR1_1_HS_SE_FILES = " " +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" -IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" -IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index e0b77d96..d49da340 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -12,10 +12,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE -IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin" -IMAGE_SR1_HS_SE_FILES:bsp-mainline = "" -IMAGE_SR1_HS_SE_FILES:bsp-next = "" -IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}" +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" From patchwork Fri Jun 27 19:30:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 65774 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 46DB6C83000 for ; Fri, 27 Jun 2025 19:30:09 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web11.1519.1751052606762357114 for ; Fri, 27 Jun 2025 12:30:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=VGiDFM3u; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55RJU5302828580; Fri, 27 Jun 2025 14:30:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751052605; bh=yM3QyyErutBr7LL3j0PJkdnVyeIwTZqXS37xVDJkZPs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=VGiDFM3ujEvjs6pM/7mDgy2tSmxQhdEFnLtYJkUBFg1vxy8ZE2SSQ4TQ9XwDu65de APkzRJFdYpqkuKk//LWAR3AmJ6o4PV7saQe7dgeu9Eewa2+I0pV5sSOrfqZs0leM8e YNi//4Ip/T3YJg3JV4GxK0pUWZzrQc7EN0d0eMGY= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55RJU5HO3530622 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Fri, 27 Jun 2025 14:30:05 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) 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.55; Fri, 27 Jun 2025 14:30:05 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE104.ent.ti.com (10.64.6.25) 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 14:30:04 -0500 Received: from lelvem-mr06.itg.ti.com ([10.249.42.149]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55RJU4l73330306; Fri, 27 Jun 2025 14:30:04 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][scarthgap/master][PATCH 2/2] meta-ti-bsp: Add all tiboot3.bin variants by wildcard Date: Fri, 27 Jun 2025 14:30:03 -0500 Message-ID: <20250627193003.575911-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250627193003.575911-1-afd@ti.com> References: <20250627193003.575911-1-afd@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 19:30:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18710 U-Boot generates all the valid versions of tiboot3.bin and picks the default based on the board's binman files. No need to duplicate this logic here, simply deploy what U-Boot gives us. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62dxx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62pxx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62xx.inc | 9 --------- meta-ti-bsp/conf/machine/include/am64xx.inc | 9 --------- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 -- meta-ti-bsp/conf/machine/include/am68.inc | 6 ------ meta-ti-bsp/conf/machine/include/am69.inc | 6 ------ meta-ti-bsp/conf/machine/include/j7200.inc | 15 --------------- meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ meta-ti-bsp/conf/machine/include/j721s2.inc | 9 --------- meta-ti-bsp/conf/machine/include/j722s.inc | 6 ------ meta-ti-bsp/conf/machine/include/j742s2.inc | 6 ------ meta-ti-bsp/conf/machine/include/j784s4.inc | 9 --------- meta-ti-bsp/conf/machine/include/k3.inc | 1 + 15 files changed, 1 insertion(+), 101 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index e5f827a9..964be0ad 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62A is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62dxx.inc b/meta-ti-bsp/conf/machine/include/am62dxx.inc index ac4e8e17..fc2ce4a3 100644 --- a/meta-ti-bsp/conf/machine/include/am62dxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc @@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62D is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index 061d0e67..d59f607d 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM62Px is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin" - TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 1eb77b4e..74054a78 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM62x is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP -IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" - -# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" - # Bitmap image tarball for early splashscreen IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 56b56afe..e353e687 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -20,15 +20,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-tqma64xxl-mbax4xxl.dtb \ " -# Default tiboot3.bin on AM64x is for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" - TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 99a3b12f..feab624a 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -28,11 +28,9 @@ KERNEL_DEVICETREE = " \ IMAGE_BOOT_FILES += "sysfw.itb" # Default on AM65x is for GP -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" # Since default on AM65x is for GP, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index 330a2973..b6d18fe0 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM68 is for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 1a19410a..759984ea 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on AM69 is for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" - -# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index e7ab409f..be5cb4cd 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -3,21 +3,6 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j7200" -# Default tiboot3.bin on J7200 is for GP -IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" - -# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 3a5a9af6..5c7ef3b7 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -11,24 +11,18 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "sysfw.itb" # Default on J721e is for GP -IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_SR1_1_HS_SE_FILES = " " -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index e6e4f162..b6d18fe0 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J721S2 is for GP -IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" - -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" - TFA_BOARD = "generic" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index d49da340..8a02441b 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J722S is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" - -# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE -IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" - TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index 9a54e11e..d2de1d0d 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -8,12 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J742S2 is for HS-FS -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin" - -# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 33224ee3..759984ea 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -8,15 +8,6 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" -# Default tiboot3.bin on J784S4 is for GP -IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" - -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" - -# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" - TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 9b85f867..d0f0bd62 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -44,6 +44,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES += "tiboot3-*-evm.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi"