spl: Use binman suffix allow symbols of any SPL etype

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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 41594fc6121c71930d8150ae61526ecd9e1267a7..10475cd3d1195e945f63fa85094815dcf8e7f12f 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -59,13 +59,13 @@ binman_sym_declare(ulong, u_boot_any, image_pos);
 binman_sym_declare(ulong, u_boot_any, size);
 
 #ifdef CONFIG_TPL
-binman_sym_declare(ulong, u_boot_spl, image_pos);
-binman_sym_declare(ulong, u_boot_spl, size);
+binman_sym_declare(ulong, u_boot_spl_any, image_pos);
+binman_sym_declare(ulong, u_boot_spl_any, size);
 #endif
 
 #ifdef CONFIG_VPL
-binman_sym_declare(ulong, u_boot_vpl, image_pos);
-binman_sym_declare(ulong, u_boot_vpl, size);
+binman_sym_declare(ulong, u_boot_vpl_any, image_pos);
+binman_sym_declare(ulong, u_boot_vpl_any, size);
 #endif
 
 #endif /* BINMAN_UBOOT_SYMBOLS */
@@ -164,10 +164,10 @@ ulong spl_get_image_pos(void)
 
 #ifdef CONFIG_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
        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);
 }
 
@@ -178,10 +178,10 @@ ulong spl_get_image_size(void)
 
 #ifdef CONFIG_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
        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);
 }
 

diff --git a/include/spl.h b/include/spl.h
index 5d5c60ab28c5b7b74ca3b055047631ddf72d6654..09a12f815f6d55221c42b5d6623dc4e42a2b0272 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -286,10 +286,10 @@ struct spl_load_info {
  */
 binman_sym_extern(ulong, u_boot_any, image_pos);
 binman_sym_extern(ulong, u_boot_any, size);
-binman_sym_extern(ulong, u_boot_spl, image_pos);
-binman_sym_extern(ulong, u_boot_spl, size);
-binman_sym_extern(ulong, u_boot_vpl, image_pos);
-binman_sym_extern(ulong, u_boot_vpl, size);
+binman_sym_extern(ulong, u_boot_spl_any, image_pos);
+binman_sym_extern(ulong, u_boot_spl_any, size);
+binman_sym_extern(ulong, u_boot_vpl_any, image_pos);
+binman_sym_extern(ulong, u_boot_vpl_any, size);
 
 /**
  * spl_get_image_pos() - get the image position of the next phase