* [PATCH v3] spl: add support for custom boot method names
@ 2022-01-17 15:25 Heiko Thiery
2022-01-29 18:48 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Thiery @ 2022-01-17 15:25 UTC (permalink / raw)
To: u-boot; +Cc: Michael Walle, Heiko Thiery
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>
---
v2:
- add function documenation
v3:
- fix in documentation
common/spl/spl.c | 5 +++++
include/spl.h | 15 ++++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4c101ec5d3..b7b53f352e 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 0af0ee3003..247267bfa0 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -459,6 +459,17 @@ void spl_board_prepare_for_boot(void);
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
*
@@ -541,7 +552,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
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] spl: add support for custom boot method names
2022-01-17 15:25 [PATCH v3] spl: add support for custom boot method names Heiko Thiery
@ 2022-01-29 18:48 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2022-01-29 18:48 UTC (permalink / raw)
To: Heiko Thiery; +Cc: u-boot, Michael Walle
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
On Mon, Jan 17, 2022 at 04:25:41PM +0100, Heiko Thiery wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-29 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-17 15:25 [PATCH v3] spl: add support for custom boot method names Heiko Thiery
2022-01-29 18:48 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.