random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

spl: Use binman suffix allow symbols of any SPL etype

Browse Source 
At present we use symbols for the u-boot-spl entry, but this is not always
what we want. For example, sandbox actually jumps to a u-boot-spl-elf
entry, since sandbox executables are ELF files.

We already handle this with U-Boot by using the '-any' suffix. Add it for
SPL as well.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-20 18:22:41 -06:00 committed by Tom Rini
parent 3e62adc497
commit 2b8d2ccdc9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/spl/spl.c
View File

@ -59,13 +59,13 @@ binman_sym_declare(ulong, u_boot_any, image_pos);
binman_sym_declare(ulong, u_boot_any, size); binman_sym_declare(ulong, u_boot_any, size);
#ifdef CONFIG_TPL #ifdef CONFIG_TPL
binman_sym_declare(ulong, u_boot_spl, image_pos); binman_sym_declare(ulong, u_boot_spl_any, image_pos);
binman_sym_declare(ulong, u_boot_spl, size); binman_sym_declare(ulong, u_boot_spl_any, size);
#endif #endif
#ifdef CONFIG_VPL #ifdef CONFIG_VPL
binman_sym_declare(ulong, u_boot_vpl, image_pos); binman_sym_declare(ulong, u_boot_vpl_any, image_pos);
binman_sym_declare(ulong, u_boot_vpl, size); binman_sym_declare(ulong, u_boot_vpl_any, size);
#endif #endif
#endif /* BINMAN_UBOOT_SYMBOLS */ #endif /* BINMAN_UBOOT_SYMBOLS */
@ -164,10 +164,10 @@ ulong spl_get_image_pos(void)
#ifdef CONFIG_VPL #ifdef CONFIG_VPL
if (spl_next_phase() == PHASE_VPL) if (spl_next_phase() == PHASE_VPL)
return binman_sym(ulong, u_boot_vpl, image_pos); return binman_sym(ulong, u_boot_vpl_any, image_pos);
#endif #endif
return spl_next_phase() == PHASE_SPL ? return spl_next_phase() == PHASE_SPL ?
binman_sym(ulong, u_boot_spl, image_pos) : binman_sym(ulong, u_boot_spl_any, image_pos) :
binman_sym(ulong, u_boot_any, image_pos); binman_sym(ulong, u_boot_any, image_pos);
} }
@ -178,10 +178,10 @@ ulong spl_get_image_size(void)
#ifdef CONFIG_VPL #ifdef CONFIG_VPL
if (spl_next_phase() == PHASE_VPL) if (spl_next_phase() == PHASE_VPL)
return binman_sym(ulong, u_boot_vpl, size); return binman_sym(ulong, u_boot_vpl_any, size);
#endif #endif
return spl_next_phase() == PHASE_SPL ? return spl_next_phase() == PHASE_SPL ?
binman_sym(ulong, u_boot_spl, size) : binman_sym(ulong, u_boot_spl_any, size) :
binman_sym(ulong, u_boot_any, size); binman_sym(ulong, u_boot_any, size);
} }

8
include/spl.h
View File

@ -286,10 +286,10 @@ struct spl_load_info {
*/ */
binman_sym_extern(ulong, u_boot_any, image_pos); binman_sym_extern(ulong, u_boot_any, image_pos);
binman_sym_extern(ulong, u_boot_any, size); binman_sym_extern(ulong, u_boot_any, size);
binman_sym_extern(ulong, u_boot_spl, image_pos); binman_sym_extern(ulong, u_boot_spl_any, image_pos);
binman_sym_extern(ulong, u_boot_spl, size); binman_sym_extern(ulong, u_boot_spl_any, size);
binman_sym_extern(ulong, u_boot_vpl, image_pos); binman_sym_extern(ulong, u_boot_vpl_any, image_pos);
binman_sym_extern(ulong, u_boot_vpl, size); binman_sym_extern(ulong, u_boot_vpl_any, size);
/** /**
* spl_get_image_pos() - get the image position of the next phase * spl_get_image_pos() - get the image position of the next phase