* [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY
2025-12-02 22:32 [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines Andrew Davis
@ 2025-12-02 22:32 ` Andrew Davis
2025-12-09 23:49 ` Denys Dmytriyenko
2025-12-02 22:32 ` [meta-ti][master][PATCH 3/4] k3r5: Use UBOOT_BINARY for R5 U-Boot Image Andrew Davis
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-02 22:32 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
These were set to the defaults we would expect from OMAP class U-Boot,
but as all board families set these including the OMAP class MACHINEs
we can remove these defaults. This helps in the cases that we do not
want to define one of these, such as SPL_BINARY in the case of OMAP-L138
which does not use SPL.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 1 -
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 3 ---
2 files changed, 4 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
index 458caaff..c1e47926 100644
--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -6,7 +6,6 @@ require conf/machine/include/omapl138.inc
UBOOT_MACHINE = "omapl138_lcdk_config"
UBOOT_SUFFIX = "ais"
-SPL_BINARY = ""
UBOOT_ENTRYPOINT = "0xc0008000"
UBOOT_LOADADDRESS = "0xc0008000"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index de4a37b4..277ec7fe 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -5,9 +5,6 @@ do_compile:prepend () {
echo ${scm_version} > ${S}/.scmversion
}
-UBOOT_SUFFIX ?= "img"
-SPL_BINARY ?= "MLO"
-
require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
require u-boot-mergeconfig.inc
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY
2025-12-02 22:32 ` [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY Andrew Davis
@ 2025-12-09 23:49 ` Denys Dmytriyenko
0 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:49 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Dec 02, 2025 at 04:32:08PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> These were set to the defaults we would expect from OMAP class U-Boot,
> but as all board families set these including the OMAP class MACHINEs
> we can remove these defaults. This helps in the cases that we do not
> want to define one of these, such as SPL_BINARY in the case of OMAP-L138
> which does not use SPL.
Isn't OMAP-L138 finally deprecated as of this year? I guess it's a good time
to remove the entire machine config as well...
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 1 -
> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 3 ---
> 2 files changed, 4 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
> index 458caaff..c1e47926 100644
> --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
> +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
> @@ -6,7 +6,6 @@ require conf/machine/include/omapl138.inc
>
> UBOOT_MACHINE = "omapl138_lcdk_config"
> UBOOT_SUFFIX = "ais"
> -SPL_BINARY = ""
>
> UBOOT_ENTRYPOINT = "0xc0008000"
> UBOOT_LOADADDRESS = "0xc0008000"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index de4a37b4..277ec7fe 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -5,9 +5,6 @@ do_compile:prepend () {
> echo ${scm_version} > ${S}/.scmversion
> }
>
> -UBOOT_SUFFIX ?= "img"
> -SPL_BINARY ?= "MLO"
> -
> require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
> require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
> require u-boot-mergeconfig.inc
> --
> 2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-ti][master][PATCH 3/4] k3r5: Use UBOOT_BINARY for R5 U-Boot Image
2025-12-02 22:32 [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines Andrew Davis
2025-12-02 22:32 ` [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY Andrew Davis
@ 2025-12-02 22:32 ` Andrew Davis
2025-12-09 23:50 ` Denys Dmytriyenko
2025-12-02 22:32 ` [meta-ti][master][PATCH 4/4] k3r5: Remove per-board SYSFW_ variables Andrew Davis
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-02 22:32 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
As R5 only builds one working image (tiboot3.bin), define this as the
"UBOOT_BINARY", even though it was technically build using the SPL build
pass in U-Boot. This allows some simplification and removes deploying of
a dummy file (u-boot-spl.bin) which is not a usable boot file. It was only
deployed as UBOOT_BINARY is not optional and so something needed to be set
here.
BeagleBone-AI64 already did something similar to this so the overrides
in that MACHINE conf can now be removed.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 6 ------
meta-ti-bsp/conf/machine/include/k3r5.inc | 8 ++------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
index 1bdfd7a1..65616b67 100644
--- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -9,10 +9,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_beagleboneai64_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc
index fcd54254..0408c09c 100644
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -15,13 +15,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
require conf/machine/include/ti-bsp.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-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-r5spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3.${UBOOT_SUFFIX}"
PACKAGECONFIG:pn-u-boot-ti-staging = ""
PACKAGECONFIG:pn-u-boot-ti-mainline = ""
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-ti][master][PATCH 3/4] k3r5: Use UBOOT_BINARY for R5 U-Boot Image
2025-12-02 22:32 ` [meta-ti][master][PATCH 3/4] k3r5: Use UBOOT_BINARY for R5 U-Boot Image Andrew Davis
@ 2025-12-09 23:50 ` Denys Dmytriyenko
0 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:50 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Dec 02, 2025 at 04:32:09PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> As R5 only builds one working image (tiboot3.bin), define this as the
> "UBOOT_BINARY", even though it was technically build using the SPL build
> pass in U-Boot. This allows some simplification and removes deploying of
> a dummy file (u-boot-spl.bin) which is not a usable boot file. It was only
> deployed as UBOOT_BINARY is not optional and so something needed to be set
> here.
>
> BeagleBone-AI64 already did something similar to this so the overrides
> in that MACHINE conf can now be removed.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 6 ------
> meta-ti-bsp/conf/machine/include/k3r5.inc | 8 ++------
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> index 1bdfd7a1..65616b67 100644
> --- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> @@ -9,10 +9,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_beagleboneai64_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc
> index fcd54254..0408c09c 100644
> --- a/meta-ti-bsp/conf/machine/include/k3r5.inc
> +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
> @@ -15,13 +15,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
> require conf/machine/include/ti-bsp.inc
> PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
>
> -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-r5spl.${UBOOT_SUFFIX}"
> -UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> -UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}"
> +UBOOT_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "tiboot3.${UBOOT_SUFFIX}"
>
> PACKAGECONFIG:pn-u-boot-ti-staging = ""
> PACKAGECONFIG:pn-u-boot-ti-mainline = ""
> --
> 2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-ti][master][PATCH 4/4] k3r5: Remove per-board SYSFW_ variables
2025-12-02 22:32 [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines Andrew Davis
2025-12-02 22:32 ` [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY Andrew Davis
2025-12-02 22:32 ` [meta-ti][master][PATCH 3/4] k3r5: Use UBOOT_BINARY for R5 U-Boot Image Andrew Davis
@ 2025-12-02 22:32 ` Andrew Davis
2025-12-09 23:50 ` Denys Dmytriyenko
2025-12-02 22:42 ` [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines PRC Automation
2025-12-09 23:48 ` Denys Dmytriyenko
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-02 22:32 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
These were used back when each board had to select the correct tiboot3.bin
to become the default for that board's image. Two things have changed since
then, first we deploy all options for tiboot3.bin generated by U-Boot. And
second, U-Boot's binman tool now symlinks the most appropriate version of
this file for us for the selected U-Boot defconfig file.
These are no longer needed so drop them.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 4 ----
meta-beagle/conf/machine/beagley-ai-k3r5.conf | 4 ----
meta-beagle/conf/machine/pocketbeagle2-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am68-sk-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/include/k3r5.inc | 3 +--
meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf | 4 ----
meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 4 ----
22 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
index 65616b67..6366174f 100644
--- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -5,8 +5,4 @@
require conf/machine/include/k3r5.inc
require conf/machine/include/beagle-bsp.inc
-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
index c00c14d1..06c74cf9 100644
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -5,10 +5,6 @@
require conf/machine/include/k3r5.inc
require conf/machine/include/beagle-bsp.inc
-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
diff --git a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
index b506cf7d..22535996 100644
--- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
@@ -5,8 +5,4 @@
require conf/machine/include/k3r5.inc
require conf/machine/include/beagle-bsp.inc
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
index 7abe706e..e02e10ed 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -4,10 +4,6 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
index 00906420..7533eb5b 100644
--- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62dx"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
index a4b1005b..44744c46 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -4,10 +4,6 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62px"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62px_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index cd95a45e..1665f586 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -4,10 +4,6 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
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 29638d1d..8319ae19 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -4,10 +4,6 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
index e846c0da..c20b9619 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -4,9 +4,5 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
index e932928a..4b97adaf 100644
--- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-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 8744ac3e..23e302a8 100644
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am65x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "am65x_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
index f8ce3688..4637f7a5 100644
--- a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am68_sk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
index 9d2b4cd6..b989cf98 100644
--- a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "am69_sk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
index b597c702..6996cc2b 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc
index 0408c09c..95dfd0c3 100644
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -16,8 +16,7 @@ require conf/machine/include/ti-bsp.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
PACKAGECONFIG:pn-u-boot-ti-staging = ""
PACKAGECONFIG:pn-u-boot-ti-mainline = ""
diff --git a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
index 68061883..a35607ad 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j7200_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
index 070bf7aa..6f904c58 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j721e_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
index 45eaabb6..a5c10824 100644
--- a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j721e_sk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
index 508e96e5..40d10f13 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
index 2c884ffd..fcdf3e8a 100644
--- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "j722s_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
index 41bf401e..9adeb306 100644
--- a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j742s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
UBOOT_MACHINE = "j742s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
index 04feebc6..754eb5f6 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
@@ -4,8 +4,4 @@
require conf/machine/include/k3r5.inc
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-ti][master][PATCH 4/4] k3r5: Remove per-board SYSFW_ variables
2025-12-02 22:32 ` [meta-ti][master][PATCH 4/4] k3r5: Remove per-board SYSFW_ variables Andrew Davis
@ 2025-12-09 23:50 ` Denys Dmytriyenko
0 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:50 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Dec 02, 2025 at 04:32:10PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> These were used back when each board had to select the correct tiboot3.bin
> to become the default for that board's image. Two things have changed since
> then, first we deploy all options for tiboot3.bin generated by U-Boot. And
> second, U-Boot's binman tool now symlinks the most appropriate version of
> this file for us for the selected U-Boot defconfig file.
>
> These are no longer needed so drop them.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 4 ----
> meta-beagle/conf/machine/beagley-ai-k3r5.conf | 4 ----
> meta-beagle/conf/machine/pocketbeagle2-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am68-sk-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/include/k3r5.inc | 3 +--
> meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf | 4 ----
> meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 4 ----
> 22 files changed, 1 insertion(+), 86 deletions(-)
>
> diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> index 65616b67..6366174f 100644
> --- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
> @@ -5,8 +5,4 @@
> require conf/machine/include/k3r5.inc
> require conf/machine/include/beagle-bsp.inc
>
> -SYSFW_SOC = "j721e"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
> diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> index c00c14d1..06c74cf9 100644
> --- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> @@ -5,10 +5,6 @@
> require conf/machine/include/k3r5.inc
> require conf/machine/include/beagle-bsp.inc
>
> -SYSFW_SOC = "j722s"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
> UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
> UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
> diff --git a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
> index b506cf7d..22535996 100644
> --- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
> +++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
> @@ -5,8 +5,4 @@
> require conf/machine/include/k3r5.inc
> require conf/machine/include/beagle-bsp.inc
>
> -SYSFW_SOC = "am62x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
> index 7abe706e..e02e10ed 100644
> --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
> @@ -4,10 +4,6 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62ax"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
>
> UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
> diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
> index 00906420..7533eb5b 100644
> --- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62dx"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
> index a4b1005b..44744c46 100644
> --- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
> @@ -4,10 +4,6 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62px"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62px_evm_r5_defconfig"
>
> UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> index cd95a45e..1665f586 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> @@ -4,10 +4,6 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62x_evm_r5_defconfig"
>
> UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
> 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 29638d1d..8319ae19 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
> @@ -4,10 +4,6 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
>
> UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> index e846c0da..c20b9619 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> @@ -4,9 +4,5 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
> UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
> index e932928a..4b97adaf 100644
> --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -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 8744ac3e..23e302a8 100644
> --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am65x_sr2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "am65x_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
> index f8ce3688..4637f7a5 100644
> --- a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j721s2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am68_sk_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> index 9d2b4cd6..b989cf98 100644
> --- a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j784s4"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "am69_sk_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
> index b597c702..6996cc2b 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "am62x"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc
> index 0408c09c..95dfd0c3 100644
> --- a/meta-ti-bsp/conf/machine/include/k3r5.inc
> +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
> @@ -16,8 +16,7 @@ require conf/machine/include/ti-bsp.inc
> PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
>
> UBOOT_SUFFIX = "bin"
> -UBOOT_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${UBOOT_SUFFIX}"
> -UBOOT_SYMLINK = "tiboot3.${UBOOT_SUFFIX}"
> +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
>
> PACKAGECONFIG:pn-u-boot-ti-staging = ""
> PACKAGECONFIG:pn-u-boot-ti-mainline = ""
> diff --git a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
> index 68061883..a35607ad 100644
> --- a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j7200"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j7200_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
> index 070bf7aa..6f904c58 100644
> --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j721e"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j721e_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
> index 45eaabb6..a5c10824 100644
> --- a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j721e"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j721e_sk_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
> index 508e96e5..40d10f13 100644
> --- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j721s2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
> index 2c884ffd..fcdf3e8a 100644
> --- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j722s"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "j722s_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
> index 41bf401e..9adeb306 100644
> --- a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j742s2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs-fs"
> -
> UBOOT_MACHINE = "j742s2_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
> index 04feebc6..754eb5f6 100644
> --- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
> @@ -4,8 +4,4 @@
>
> require conf/machine/include/k3r5.inc
>
> -SYSFW_SOC = "j784s4"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "gp"
> -
> UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
> --
> 2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines
2025-12-02 22:32 [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines Andrew Davis
` (2 preceding siblings ...)
2025-12-02 22:32 ` [meta-ti][master][PATCH 4/4] k3r5: Remove per-board SYSFW_ variables Andrew Davis
@ 2025-12-02 22:42 ` PRC Automation
2025-12-09 23:48 ` Denys Dmytriyenko
4 siblings, 0 replies; 9+ messages in thread
From: PRC Automation @ 2025-12-02 22:42 UTC (permalink / raw)
To: Andrew Davis; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
meta-ti / na / 20251202223210.3816583-1-afd
PRC Results: PASS
=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines
WARN: Commit message should not include directory path to recipe: conf: machine: Remove remaining K3 HS machines.
conf (COMMIT-MESSAGE-3)
patch
For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887
WARN - [meta-ti][master][PATCH 2/4] u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY
WARN: Commit message does not include file/recipe name: u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY. (COMMIT-MESSAGE-2)
patch
For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887
=========================================================
apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines
- Submitter: From: Andrew Davis <afd@ti.com>
- Date: Date: Tue, 2 Dec 2025 16:32:07 -0600
- Num Patches: 4
- Mailing List (public inbox) Commit SHA: 637fd47f9e6fb8a210272210a92e341d328a416f
Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master-next
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202512020100
- Commit SHA: 5845cf70a07893d396ed0d516ad5580c2bf0e201
Patches
----------------------------------------
All patches applied
=========================================================
check-yocto-repo: PASS
=========================================================
master
=====================
PASS
=========================================================
yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines
2025-12-02 22:32 [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines Andrew Davis
` (3 preceding siblings ...)
2025-12-02 22:42 ` [meta-ti][master][PATCH 1/4] conf: machine: Remove remaining K3 HS machines PRC Automation
@ 2025-12-09 23:48 ` Denys Dmytriyenko
4 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:48 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, meta-ti
On Tue, Dec 02, 2025 at 04:32:07PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> Every MACHINE build deploys a tiboot3.bin file for all three K3 security
> types (GP, HS-FS, HS-SE). These extra MACHINE configs existed to select
> a different default. As U-Boot now selects a default for us this logic
> does not need to exist here. Instead if one wants to use a non-default
> security type for an EVM then can simply rename the tiboot3.bin file in
> the boot partition. Testing automation already handles this and Sitara-
> family devices have dropped the dedicated MACHINE configs, do the same
> for Jacinto-family devices.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 11 -----------
> meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 7 -------
> meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf | 11 -----------
> meta-ti-bsp/conf/machine/j7200-hs-evm.conf | 7 -------
> meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 11 -----------
> meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 7 -------
> meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf | 11 -----------
> meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 5 -----
> meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf | 11 -----------
> meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 5 -----
> 10 files changed, 86 deletions(-)
> delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
> delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j7200-hs-evm.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
> delete mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>
> diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
> deleted file mode 100644
> index 337c8413..00000000
> --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: AM65xx HS EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "am65x_sr2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -UBOOT_MACHINE = "am65x_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
> deleted file mode 100644
> index f8221f31..00000000
> --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: AM65xx HS EVM
> -#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
> -
> -require conf/machine/include/am65xx.inc
> -
> -UBOOT_MACHINE = "am65x_evm_a53_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
> deleted file mode 100644
> index 1922d5c8..00000000
> --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J7200 HS EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "j7200_sr2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -UBOOT_MACHINE = "j7200_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
> deleted file mode 100644
> index 54fd2b4a..00000000
> --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J7200 HS EVM
> -#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
> -
> -require conf/machine/j7200-evm.conf
> -
> -UBOOT_MACHINE = "j7200_evm_a72_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
> deleted file mode 100644
> index 7904c660..00000000
> --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J721e HS EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "j721e_sr1_1"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -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
> deleted file mode 100644
> index 441ca169..00000000
> --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J721e HS EVM
> -#@DESCRIPTION: Machine configuration for the TI J721e HS EVM
> -
> -require conf/machine/j721e-evm.conf
> -
> -UBOOT_MACHINE = "j721e_evm_a72_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
> deleted file mode 100644
> index 58cd92c4..00000000
> --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J721S2 HS EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "j721s2"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> deleted file mode 100644
> index 4cf32a28..00000000
> --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J721S2 HS EVM
> -#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
> -
> -require conf/machine/j721s2-evm.conf
> diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
> deleted file mode 100644
> index 80a228a0..00000000
> --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J784S4 HS EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core)
> -
> -require conf/machine/include/k3r5.inc
> -
> -SYSFW_SOC = "j784s4"
> -SYSFW_CONFIG = "evm"
> -SYSFW_SUFFIX = "hs"
> -
> -UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> deleted file mode 100644
> index 8fa1c1fd..00000000
> --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#@TYPE: Machine
> -#@NAME: J784S4 HS EVM
> -#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
> -
> -require conf/machine/j784s4-evm.conf
> --
> 2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread