1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-11 17:10:27 +00:00

k3r5: Use UBOOT_BINARY for R5 U-Boot Image

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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2025-12-02 16:32:09 -06:00
committed by Ryan Eatmon
parent 65ee7c49c8
commit 32e30bef7a
2 changed files with 2 additions and 12 deletions

View File

@@ -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"

View File

@@ -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 = ""