| Message ID | 20251202223210.3816583-3-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master,1/4] conf: machine: Remove remaining K3 HS machines | expand |
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
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 = ""
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(-)