All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-ti][master/kirkstone][PATCH 1/8] conf: machine: Move IMAGE_BOOT_FILES to the SoC inc for J721s2 and J784s4
@ 2023-10-25 16:56 Andrew Davis
  2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 2/8] ti-linux-fw: Make CLEANBROKEN and FILES part of common include Andrew Davis
                   ` (6 more replies)
  0 siblings, 7 replies; 13+ messages in thread
From: Andrew Davis @ 2023-10-25 16:56 UTC (permalink / raw)
  To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis

These defines are specific to a SoC, not any specific board. Move these
to the SoC level for these boards to be consistent with boards already
doing this correctly.

J7200 didn't have these at all, add them while we are here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-ti-bsp/conf/machine/include/j7200.inc  | 9 +++++++++
 meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++++
 meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++++
 meta-ti-bsp/conf/machine/j721s2-evm.conf    | 6 ------
 meta-ti-bsp/conf/machine/j784s4-evm.conf    | 6 ------
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
index d21e26cc..af43605d 100644
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,6 +1,15 @@
 require conf/machine/include/k3.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 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/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 98cc611f..98495582 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# 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"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index de207687..053d378e 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# 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"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 56a949e5..ecb1836f 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -19,9 +19,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-# 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"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 2421b0b9..40a63651 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -19,9 +19,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-# 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"
-- 
2.39.2



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-11-03 16:20 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-25 16:56 [meta-ti][master/kirkstone][PATCH 1/8] conf: machine: Move IMAGE_BOOT_FILES to the SoC inc for J721s2 and J784s4 Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 2/8] ti-linux-fw: Make CLEANBROKEN and FILES part of common include Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 3/8] ti-linux-fw: Do not set source directory when including ti-linux-fw.inc Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 4/8] ti-sci-fw: Do not unexport CFLAGS, LDFLAGS, AS, or LD Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 5/8] vpdma-fw: This firmware blob does not depend on the kernel Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 6/8] ti-linux-fw: Add several more firmware helper lines to this common include Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 7/8] recipes-bsp: Do not inherit deploy in recipes that do not deploy anything Andrew Davis
2023-10-25 16:56 ` [meta-ti][master/kirkstone][PATCH 8/8] recipes-bsp: Do not use MACHINE_ARCH when package is not machine specific Andrew Davis
2023-10-26  3:27   ` Denys Dmytriyenko
2023-10-26 14:00     ` Andrew Davis
2023-11-02 14:57       ` Ryan Eatmon
2023-11-03  6:15         ` Denys Dmytriyenko
2023-11-03 16:20           ` Ryan Eatmon

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.