summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Davis <afd@ti.com>2023-05-25 13:11:31 -0500
committerRyan Eatmon <reatmon@ti.com>2023-06-06 08:24:37 -0500
commit79c2fbfeb273a5f6452a61e8c6bfe47dc078810d (patch)
tree80198feea1421a96a4c9fe7e6fdf4c8bba32291d
parentdf7c7e627de8e5b92ef5fa8d97e023ad4d15d9c6 (diff)
downloadmeta-ti-79c2fbfeb273a5f6452a61e8c6bfe47dc078810d.tar.gz
conf: machine: Switch all the machines over to U-Boot binman
Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat
-rw-r--r--meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf12
-rw-r--r--meta-ti-bsp/conf/machine/am62axx-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf11
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf7
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf12
-rw-r--r--meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf7
-rw-r--r--meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf7
-rw-r--r--meta-ti-bsp/conf/machine/am65xx-hs-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/include/am62axx.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx-lp.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/am64xx.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/am65xx.inc13
-rw-r--r--meta-ti-bsp/conf/machine/include/j721e.inc12
-rw-r--r--meta-ti-bsp/conf/machine/include/k3.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/k3r5.inc4
-rw-r--r--meta-ti-bsp/conf/machine/j7200-hs-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf6
-rw-r--r--meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf6
-rw-r--r--meta-ti-bsp/conf/machine/j721e-hs-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/j721s2-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/j721s2-hs-evm.conf6
-rw-r--r--meta-ti-bsp/conf/machine/j784s4-evm.conf4
-rw-r--r--meta-ti-bsp/conf/machine/j784s4-hs-evm.conf2
26 files changed, 59 insertions, 103 deletions
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 @@
1#@TYPE: Machine
2#@NAME: AM62A HS-FS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6SOC_FAMILY:append = ":k3r5-hs-fs"
7
8SYSFW_SOC = "am62ax"
9SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs"
11
12UBOOT_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 = " \
14" 14"
15 15
16UBOOT_MACHINE = "am62ax_evm_a53_defconfig" 16UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
17
18SPL_BINARY = "tispl.bin_HS"
19UBOOT_BINARY = "u-boot.img_HS"
20UBOOT_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 @@
1#@TYPE: Machine
2#@NAME: AM62XX EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am62x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_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 = " \
12 12
13UBOOT_MACHINE = "am62x_evm_a53_defconfig" 13UBOOT_MACHINE = "am62x_evm_a53_defconfig"
14 14
15SPL_BINARY = "tispl.bin_HS" 15SPL_BINARY = "tispl.bin"
16UBOOT_BINARY = "u-boot.img_HS" 16UBOOT_BINARY = "u-boot.img"
17UBOOT_SYMLINK = "u-boot.img" 17UBOOT_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"
9SYSFW_CONFIG = "evm" 9SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "gp" 10SYSFW_SUFFIX = "gp"
11 11
12SYSFW_TIBOOT3_SYMLINK = ""
13
14UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" 12UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
15
16SPL_BINARY = ""
17UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
18UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
19UBOOT_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 = " \
13 ti/k3-am62-lp-sk.dtb \ 13 ti/k3-am62-lp-sk.dtb \
14" 14"
15 15
16SPL_BINARY = "tispl.bin_HS"
17UBOOT_BINARY = "u-boot.img_HS"
18UBOOT_SYMLINK = "u-boot.img"
19
20UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" 16UBOOT_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 @@
1#@TYPE: Machine
2#@NAME: AM64xx EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6SOC_FAMILY:append = ":am64xx"
7
8SYSFW_SOC = "am64x_sr2"
9SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs"
11
12UBOOT_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
7SYSFW_SOC = "am65x" 7SYSFW_SOC = "am65x"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp" 9SYSFW_SUFFIX = "gp"
10SYSFW_SYMLINK = ""
11 10
12SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" 11SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned"
13SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
14UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
15UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
16UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
17 12
18UBOOT_MACHINE = "am65x_evm_r5_defconfig" 13UBOOT_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
7SYSFW_SOC = "am65x" 7SYSFW_SOC = "am65x"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs" 9SYSFW_SUFFIX = "hs"
10SYSFW_SYMLINK = ""
11 10
12SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" 11SPL_BINARY = "tiboot3.${SPL_SUFFIX}"
13SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
14UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
15UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
16UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
17 12
18UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" 13UBOOT_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"
7require conf/machine/include/am65xx.inc 7require conf/machine/include/am65xx.inc
8 8
9UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" 9UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
10
11SPL_BINARY = "tispl.bin_HS"
12UBOOT_BINARY = "u-boot.img_HS"
13UBOOT_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"
6TFA_K3_SYSTEM_SUSPEND = "1" 6TFA_K3_SYSTEM_SUSPEND = "1"
7 7
8# Default tiboot3.bin on AM62A is for HS-FS 8# Default tiboot3.bin on AM62A is for HS-FS
9BBMULTICONFIG = "k3r5-hs-fs"
10IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" 9IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
11do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
12 10
13# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP 11# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
14BBMULTICONFIG += "k3r5-gp"
15IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
16do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
17 13
18# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE 14# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
19BBMULTICONFIG += "k3r5-hs-se"
20IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" 15IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
21do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
22 16
23TFA_BOARD = "lite" 17TFA_BOARD = "lite"
24OPTEEMACHINE = "k3-am62x" 18OPTEEMACHINE = "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"
6TFA_K3_SYSTEM_SUSPEND = "1" 6TFA_K3_SYSTEM_SUSPEND = "1"
7 7
8# Default tiboot3.bin on AM62x LP is for HS-FS 8# Default tiboot3.bin on AM62x LP is for HS-FS
9BBMULTICONFIG = "k3r5-hs-fs"
10IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" 9IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
11do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
12 10
13# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE 11# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
14BBMULTICONFIG += "k3r5-hs-se"
15IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
16do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
17 13
18TFA_BOARD = "lite" 14TFA_BOARD = "lite"
19OPTEEMACHINE = "k3-am62x" 15OPTEEMACHINE = "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
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
8 8
9# Default tiboot3.bin on AM62x is for HS-FS 9# Default tiboot3.bin on AM62x is for HS-FS
10BBMULTICONFIG = "k3r5-hs-fs"
11IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" 10IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
12do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
13 11
14# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP 12# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
15BBMULTICONFIG += "k3r5-gp"
16IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" 13IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
17do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
18 14
19# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE 15# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
20BBMULTICONFIG += "k3r5-hs-se"
21IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" 16IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
22do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
23 17
24TFA_BOARD = "lite" 18TFA_BOARD = "lite"
25TFA_K3_SYSTEM_SUSPEND = "1" 19TFA_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 = " \
9" 9"
10 10
11# Default tiboot3.bin on AM64x is for SR2.0 HS-FS 11# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
12BBMULTICONFIG = "k3r5-sr2-hs-fs"
13do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
14IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
15 13
16# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP 14# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
17BBMULTICONFIG += "k3r5-gp"
18do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
19IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" 15IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
20 16
21# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE 17# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
22BBMULTICONFIG += "k3r5-sr2-hs-se"
23do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
24IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" 18IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
25 19
26TFA_BOARD = "lite" 20TFA_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 = " \
12 ti/k3-am654-base-board.dtb \ 12 ti/k3-am654-base-board.dtb \
13" 13"
14 14
15# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw 15IMAGE_BOOT_FILES += "sysfw.itb"
16do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
17 16
18# Default sysfw.itb on AM65x is for SR2.0 17# Default sysfw.itb on AM65x is for GP
19BBMULTICONFIG += "k3r5-sr2" 18IMAGE_BOOT_FILES += "sysfw-am65x-gp-evm.itb"
20do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
21IMAGE_BOOT_FILES += "sysfw.itb sysfw-am65x_sr2-${SYSFW_SUFFIX}-evm.itb"
22 19
23# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 20# Since default sysfw.itb on AM65x is for GP, add a version for HS-SE
24IMAGE_BOOT_FILES += "sysfw-am65x-${SYSFW_SUFFIX}-evm.itb" 21IMAGE_BOOT_FILES += "sysfw-am65x-hs-evm.itb"
25 22
26TFA_BOARD = "generic" 23TFA_BOARD = "generic"
27 24
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"
6require conf/machine/include/mesa-pvr.inc 6require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
8 8
9# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
10do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
11
12IMAGE_BOOT_FILES += "sysfw.itb" 9IMAGE_BOOT_FILES += "sysfw.itb"
13 10
11# Default sysfw.itb on J721e is for GP
12IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
13
14# Since default sysfw.itb on J721e is for GP, add a version for HS-FS
15IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
16
17# Since default sysfw.itb on J721e is for GP, add a version for HS-SE
18IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
19
14TFA_BOARD = "generic" 20TFA_BOARD = "generic"
15 21
16OPTEEMACHINE = "k3-j721e" 22OPTEEMACHINE = "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"
53WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" 53WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
54 54
55do_image_wic[depends] += "virtual/bootloader:do_deploy" 55do_image_wic[depends] += "virtual/bootloader:do_deploy"
56do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy" 56do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
57 57
58SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" 58SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
59SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 59SERIAL_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"
15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
16PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" 16PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
17 17
18SPL_BINARY = "" 18SPL_SUFFIX = "bin"
19SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
20SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}"
19UBOOT_SUFFIX = "bin" 21UBOOT_SUFFIX = "bin"
20UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" 22UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
21UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" 23UBOOT_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 @@
5require conf/machine/j7200-evm.conf 5require conf/machine/j7200-evm.conf
6 6
7UBOOT_MACHINE = "j7200_evm_a72_defconfig" 7UBOOT_MACHINE = "j7200_evm_a72_defconfig"
8
9SPL_BINARY = "tispl.bin_HS"
10UBOOT_BINARY = "u-boot.img_HS"
11UBOOT_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"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp" 9SYSFW_SUFFIX = "gp"
10 10
11SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" 11SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned"
12SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
13UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
14UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
15UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
16 12
17UBOOT_MACHINE = "j721e_evm_r5_defconfig" 13UBOOT_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"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs" 9SYSFW_SUFFIX = "hs"
10 10
11SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" 11SPL_BINARY = "tiboot3.${SPL_SUFFIX}"
12SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
13UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
14UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
15UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
16 12
17UBOOT_MACHINE = "j721e_evm_r5_defconfig" 13UBOOT_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 @@
5require conf/machine/j721e-evm.conf 5require conf/machine/j721e-evm.conf
6 6
7UBOOT_MACHINE = "j721e_evm_a72_defconfig" 7UBOOT_MACHINE = "j721e_evm_a72_defconfig"
8
9SPL_BINARY = "tispl.bin_HS"
10UBOOT_BINARY = "u-boot.img_HS"
11UBOOT_SYMLINK = "u-boot.img"
12SYSFW_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 = " \
20UBOOT_MACHINE = "j721s2_evm_a72_defconfig" 20UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
21 21
22# Default tiboot3.bin on J721S2 is for GP 22# Default tiboot3.bin on J721S2 is for GP
23BBMULTICONFIG = "k3r5-gp"
24IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" 23IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
25do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
26 24
27# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS 25# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
28BBMULTICONFIG += "k3r5-sr1-hs-fs"
29IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" 26IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
30do_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 = " \
18" 18"
19 19
20UBOOT_MACHINE = "j721s2_evm_a72_defconfig" 20UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
21
22do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
23
24SPL_BINARY = "tispl.bin_HS"
25UBOOT_BINARY = "u-boot.img_HS"
26UBOOT_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 = " \
20UBOOT_MACHINE = "j784s4_evm_a72_defconfig" 20UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
21 21
22# Default tiboot3.bin on J784S4 is for GP 22# Default tiboot3.bin on J784S4 is for GP
23BBMULTICONFIG = "k3r5-gp"
24IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" 23IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
25do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
26 24
27# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS 25# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
28BBMULTICONFIG += "k3r5-sr1-hs-fs"
29IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" 26IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
30do_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 = " \
20 20
21UBOOT_MACHINE = "j784s4_evm_a72_defconfig" 21UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
22 22
23do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
24
25TFA_BOARD = "j784s4" 23TFA_BOARD = "j784s4"
26 24
27SPL_BINARY = "tispl.bin_HS" 25SPL_BINARY = "tispl.bin_HS"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-28 13:44:54 +0000