diff options
| author | Heiko Thiery <heiko.thiery@gmail.com> | 2022-01-17 16:25:41 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-28 17:58:41 -0500 |
| commit | c592292385b484e4da07d395ac67cd7f83f3f326 (patch) | |
| tree | 7c02d10a90d9229e5fd8c2a970374df91ee32356 | |
| parent | 2d0953c0e0de02dc470345c2b07d77d2a782dba6 (diff) | |
spl: add support for custom boot method names
Currently the names MMC1, MMC2 and MMC2_2 are output in the SPL. To
achieve more userbility here the name of the boot source can be returned.
E.g. for "MMC1" -> "eMMC" or "MMC2" -> "SD card".
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Reviewed-by: Michael Walle <michael@walle.cc>
Tested-by: Michael Walle <michael@walle.cc>
| -rw-r--r-- | common/spl/spl.c | 5 | ||||
| -rw-r--r-- | include/spl.h | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 6945ecb56ef..884102bdea4 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -174,6 +174,11 @@ __weak void spl_board_prepare_for_optee(void *fdt) { } +__weak const char *spl_board_loader_name(u32 boot_device) +{ + return NULL; +} + #if CONFIG_IS_ENABLED(OPTEE_IMAGE) __weak void __noreturn jump_to_image_optee(struct spl_image_info *spl_image) { diff --git a/include/spl.h b/include/spl.h index 8748497bc1f..bb92bc6ec6c 100644 --- a/include/spl.h +++ b/include/spl.h @@ -463,6 +463,17 @@ int spl_board_ubi_load_image(u32 boot_device); int spl_board_boot_device(u32 boot_device); /** + * spl_board_loader_name() - Return a name for the loader + * + * This is a weak function which might be overridden by the board code. With + * that a board specific value for the device where the U-Boot will be loaded + * from can be set. By default it returns NULL. + * + * @boot_device: ID of the device which SPL wants to load U-Boot from. + */ +const char *spl_board_loader_name(u32 boot_device); + +/** * jump_to_image_linux() - Jump to a Linux kernel from SPL * * This jumps into a Linux kernel using the information in @spl_image. @@ -544,7 +555,9 @@ struct spl_image_loader { static inline const char *spl_loader_name(const struct spl_image_loader *loader) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - return loader->name; + const char *name; + name = spl_board_loader_name(loader->boot_device); + return name ?: loader->name; #else return NULL; #endif |