From patchwork Thu May 25 18:11:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 24511 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 F2087C7EE29 for ; Thu, 25 May 2023 18:11:40 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.18764.1685038299555726183 for ; Thu, 25 May 2023 11:11:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=lvNlIumu; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34PIBbQT077485; Thu, 25 May 2023 13:11:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1685038297; bh=qFpbTzndU8ktzHDgfjS7J7dD7a6MHTl/+/dNkjXckpo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lvNlIumuiqcjx2NIwH/VyO74flzeARow34x1x1mHmgwkRH0B+7qpFDPQK3RUoRyKi CJxQZPDNHzZpO2TqIyoXvL7zZ2Wx4XivFW23jxGYdW5EbNrIUSCVktqUKYMwf93PFS XxZPZI1rrqMHCGwsoOGM7M1zj51UBYSu3lBNQS6Q= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34PIBbeb016398 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 25 May 2023 13:11:37 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 25 May 2023 13:11:37 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) 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.23 via Frontend Transport; Thu, 25 May 2023 13:11:36 -0500 Received: from lelv0326.itg.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34PIBXH1102467; Thu, 25 May 2023 13:11:36 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 8/9] conf: machine: Switch all the machines over to U-Boot binman Date: Thu, 25 May 2023 13:11:31 -0500 Message-ID: <20230525181132.417197-9-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525181132.417197-1-afd@ti.com> References: <20230525181132.417197-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 ; Thu, 25 May 2023 18:11:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16595 Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 12 ++++++++++++ meta-ti-bsp/conf/machine/am62axx-evm.conf | 4 ---- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am62xx-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 7 ------- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 4 ---- meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 12 ++++++++++++ meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 7 +------ meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 7 +------ meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 4 ---- meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 4 ---- meta-ti-bsp/conf/machine/include/am62xx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am64xx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am65xx.inc | 13 +++++-------- meta-ti-bsp/conf/machine/include/j721e.inc | 12 +++++++++--- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- meta-ti-bsp/conf/machine/include/k3r5.inc | 4 +++- meta-ti-bsp/conf/machine/j7200-hs-evm.conf | 4 ---- meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 6 +----- meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 6 +----- meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ---- meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 6 ------ meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 ---- meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 -- 26 files changed, 59 insertions(+), 103 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf new file mode 100644 index 00000000..80b6497f --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM62A HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core) + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index d48109ae..d5d60718 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -14,7 +14,3 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "am62ax_evm_a53_defconfig" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf new file mode 100644 index 00000000..724a8d4a --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index d54213d4..5b86a1f5 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -12,6 +12,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "am62x_evm_a53_defconfig" -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" +SPL_BINARY = "tispl.bin" +UBOOT_BINARY = "u-boot.img" UBOOT_SYMLINK = "u-boot.img" 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 15ecc677..54059dd7 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -9,11 +9,4 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "" - UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index ce306a2a..1f1b47ba 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -13,8 +13,4 @@ KERNEL_DEVICETREE = " \ ti/k3-am62-lp-sk.dtb \ " -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf new file mode 100644 index 00000000..4369becc --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM64xx EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am64xx" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index a484e444..2a7b5990 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -7,12 +7,7 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_SYMLINK = "" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned" UBOOT_MACHINE = "am65x_evm_r5_defconfig" 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..3ca728dc 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -7,12 +7,7 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +SPL_BINARY = "tiboot3.${SPL_SUFFIX}" UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf index 84d616a4..3c6a1574 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf @@ -7,7 +7,3 @@ SYSFW_SUFFIX = "hs" require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index e708a313..12889057 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -6,19 +6,13 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62A is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index 99237a90..f3fe944b 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc @@ -6,14 +6,10 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62x LP is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index c98da5f5..0bd5279d 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -7,19 +7,13 @@ require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" # Default tiboot3.bin on AM62x is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index f5f4ffe7..9112b78b 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -9,18 +9,12 @@ KERNEL_DEVICETREE = " \ " # Default tiboot3.bin on AM64x is for SR2.0 HS-FS -BBMULTICONFIG = "k3r5-sr2-hs-fs" -do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" 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 -BBMULTICONFIG += "k3r5-gp" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" 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 -BBMULTICONFIG += "k3r5-sr2-hs-se" -do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 10d2f293..548a96f2 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -12,16 +12,13 @@ KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ " -# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw -do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" +IMAGE_BOOT_FILES += "sysfw.itb" -# Default sysfw.itb on AM65x is for SR2.0 -BBMULTICONFIG += "k3r5-sr2" -do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" -IMAGE_BOOT_FILES += "sysfw.itb sysfw-am65x_sr2-${SYSFW_SUFFIX}-evm.itb" +# Default sysfw.itb on AM65x is for GP +IMAGE_BOOT_FILES += "sysfw-am65x-gp-evm.itb" -# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 -IMAGE_BOOT_FILES += "sysfw-am65x-${SYSFW_SUFFIX}-evm.itb" +# Since default sysfw.itb on AM65x is for GP, add a version for HS-SE +IMAGE_BOOT_FILES += "sysfw-am65x-hs-evm.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index f707cf26..f77099a1 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -6,11 +6,17 @@ MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw -do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" - IMAGE_BOOT_FILES += "sysfw.itb" +# Default sysfw.itb on J721e is for GP +IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" + +# Since default sysfw.itb on J721e is for GP, add a version for HS-FS +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" + +# Since default sysfw.itb on J721e is for GP, add a version for HS-SE +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" + TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index c6b55239..f8bfb3db 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -53,7 +53,7 @@ MACHINE_FEATURES += "efi" WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 377a2b2f..3df5cf35 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -15,7 +15,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" -SPL_BINARY = "" +SPL_SUFFIX = "bin" +SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" +SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" UBOOT_SUFFIX = "bin" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf index 4facbc37..54fd2b4a 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf @@ -5,7 +5,3 @@ require conf/machine/j7200-evm.conf UBOOT_MACHINE = "j7200_evm_a72_defconfig" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index 9544cdb6..d54af565 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -8,10 +8,6 @@ SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned" UBOOT_MACHINE = "j721e_evm_r5_defconfig" 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 94c434ea..c529985f 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -8,10 +8,6 @@ SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +SPL_BINARY = "tiboot3.${SPL_SUFFIX}" UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index 0ed77c3d..441ca169 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -5,8 +5,3 @@ require conf/machine/j721e-evm.conf UBOOT_MACHINE = "j721e_evm_a72_defconfig" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" -SYSFW_SYMLINK = "" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 78973600..4816f9cf 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -20,11 +20,7 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j721s2_evm_a72_defconfig" # Default tiboot3.bin on J721S2 is for GP -BBMULTICONFIG = "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" -do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS -BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf index 6a58a687..564b571d 100644 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf @@ -18,9 +18,3 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" - -do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 4274e800..47290cc0 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -20,11 +20,7 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is for GP -BBMULTICONFIG = "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" -do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf index 815731f8..847a26b6 100644 --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf @@ -20,8 +20,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" -do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" - TFA_BOARD = "j784s4" SPL_BINARY = "tispl.bin_HS"