michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge patch series "ARM: bootm: Add support for starting Linux through OPTEE-OS on ARMv7a"

Browse Source 
This series from Marek Vasut <marek.vasut@mailbox.org> brings some
enhancements to use cases using OPTEE-OS on ARMv7a platforms, some of
which already existed on ARMv8.

Link: https://lore.kernel.org/r/20251030212359.12824-1-marek.vasut@mailbox.org
This commit is contained in:
Tom Rini
2025-11-06 11:32:57 -06:00
parent 5451315bab be0e9ac7c8
commit ad9240cb9d
9 changed files with 192 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/spl/spl_fit.c
View File

@@ -550,6 +550,23 @@ static int spl_fit_image_is_fpga(const void *fit, int node)
return !strcmp(type, "fpga");
}
static void spl_fit_image_record_arm32_optee(const void *fit, int node,
struct spl_image_info *spl_image,
struct spl_image_info *image_info)
{
#if defined(CONFIG_BOOTM_OPTEE) && defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
const char *type = fdt_getprop(fit, node, FIT_TYPE_PROP, NULL);
if (!type)
return;
if (strcmp(type, "tee"))
return;
spl_image->optee_addr = image_info->load_addr;
#endif
}
static int spl_fit_image_get_os(const void *fit, int noffset, uint8_t *os)
{
if (!CONFIG_IS_ENABLED(FIT_IMAGE_TINY) || CONFIG_IS_ENABLED(OS_BOOT))
@@ -903,6 +920,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
image_info.entry_point != FDT_ERROR)
spl_image->entry_point = image_info.entry_point;
spl_fit_image_record_arm32_optee(ctx.fit, node, spl_image,
&image_info);
/* Record our loadables into the FDT */
if (!CONFIG_IS_ENABLED(FIT_IMAGE_TINY) &&
xpl_get_fdt_update(info) && spl_image->fdt_addr)