All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
	Ryan Eatmon <reatmon@ti.com>, Praneeth Bajjuri <praneeth@ti.com>,
	Neha Malcom Francis <n-francis@ti.com>,
	<meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][master/kirkstone][RFC 8/9] conf: machine: Switch all the machines over to U-Boot binman
Date: Tue, 25 Apr 2023 12:23:44 -0500	[thread overview]
Message-ID: <20230425172345.12293-9-afd@ti.com> (raw)
In-Reply-To: <20230425172345.12293-1-afd@ti.com>

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf   | 12 ++++++++++++
 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/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/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      |  5 -----
 meta-ti-bsp/conf/machine/include/j721e.inc       |  3 ---
 meta-ti-bsp/conf/machine/include/k3.inc          |  2 +-
 meta-ti-bsp/conf/machine/include/k3r5.inc        |  5 ++++-
 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/j721s2-evm.conf         |  4 ----
 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf      |  2 --
 meta-ti-bsp/conf/machine/j784s4-evm.conf         |  4 ----
 meta-ti-bsp/conf/machine/j784s4-hs-evm.conf      |  2 --
 21 files changed, 42 insertions(+), 79 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/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/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..b1b2490e 100644
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
@@ -7,12 +7,5 @@ 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}"
 
 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..836460e9 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,5 @@ 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}"
 
 UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index eacfa584..5cc95585 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -6,18 +6,12 @@ MACHINE_FEATURES += "screen touchscreen"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 # Default tiboot3.bin on AM62A is for HS-FS
-BBMULTICONFIG = "k3r5-hs-fs"
-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 bcc6f493..3c0249eb 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -6,13 +6,9 @@ MACHINE_FEATURES += "screen touchscreen"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 # Default tiboot3.bin on AM62x LP is for HS-FS
-BBMULTICONFIG = "k3r5-hs-fs"
-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 623d90eb..cb8db03f 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,18 +6,12 @@ MACHINE_FEATURES += "screen gpu"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
 # Default tiboot3.bin on AM62x is for HS-FS
-BBMULTICONFIG = "k3r5-hs-fs"
-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 9fe851f4..0ddb088e 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -11,12 +11,7 @@ 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"
-
 # 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"
 
 # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 5e325ffe..e33918aa 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -5,9 +5,6 @@ MACHINE_FEATURES += "screen gpu"
 
 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"
 
 TFA_BOARD = "generic"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 31da2ca9..6ca9f17a 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -52,7 +52,7 @@ MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "sdimage-2part-efi.wks"
 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..8b8cedbe 100644
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -15,7 +15,10 @@ 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_BINARY = "tiboot3.${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/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
index 9544cdb6..070bf7aa 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
@@ -8,10 +8,4 @@ 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}"
-
 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 56312c0c..74abbbfd 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,4 @@ 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}"
-
 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 2a128411..e396bfad 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -19,10 +19,6 @@ KERNEL_DEVICETREE = " \
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
 # Default tiboot3.bin on J721S2 is for GP
-BBMULTICONFIG = "k3r5-gp"
-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 337818a4..59f3cfbc 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -14,8 +14,6 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j721s2_hs_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 7971ad73..8045dd75 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -17,10 +17,6 @@ KERNEL_DEVICETREE = ""
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
 # Default tiboot3.bin on J784S4 is for GP
-BBMULTICONFIG = "k3r5-gp"
-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 123de8c1..12163dd8 100644
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -14,8 +14,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"
-- 
2.39.2



  parent reply	other threads:[~2023-04-25 17:23 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-25 17:23 [meta-ti][master/kirkstone][RFC 0/9] Switch to U-Boot binman Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 1/9] ti-dm-fw: Add recipe for TI DM firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 2/9] ti-eth-fw: Add recipe for TI Ethernet firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 3/9] ti-sci-fw: Remove source package recipe Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe Andrew Davis
2023-04-27 20:31   ` Denys Dmytriyenko
2023-04-28 15:13     ` Andrew Davis
2023-05-02 19:38       ` Denys Dmytriyenko
2023-05-04 14:00         ` Andrew Davis
2023-05-06  1:42           ` Denys Dmytriyenko
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 5/9] u-boot-ti-staging: Remove version 2021.01 Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 6/9] ti-sci-fw: Drop k3-image-gen and only provide firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 7/9] u-boot-ti-staging: Use binman to package our firmware Andrew Davis
2023-04-25 17:23 ` Andrew Davis [this message]
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 9/9] conf: machine: Remove all leftover config files Andrew Davis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230425172345.12293-9-afd@ti.com \
    --to=afd@ti.com \
    --cc=denys@konsulko.com \
    --cc=meta-ti@lists.yoctoproject.org \
    --cc=n-francis@ti.com \
    --cc=praneeth@ti.com \
    --cc=reatmon@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.