Skip to contentSkip to conversation

spl: add support for custom boot method names

PATCH Superseded Heiko Thiery 2 participants 3 messages Jan 13, 2022 – Jan 16, 2022

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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".

---
 common/spl/spl.c | 5 +++++
 include/spl.h    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
common/spl/spl.c +5 -0
index 4c101ec5d3..b7b53f352e 100644
@@ -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)
 {
include/spl.h +4 -1
index 0af0ee3003..a7f17a3837 100644
@@ -458,6 +458,7 @@ void spl_board_prepare_for_optee(void *fdt);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);
 int spl_board_boot_device(u32 boot_device);
+const char *spl_board_loader_name(u32 boot_device);
 
 /**
  * jump_to_image_linux() - Jump to a Linux kernel from SPL
@@ -541,7 +542,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
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Am 2022-01-13 16:22, schrieb Heiko Thiery:

Quoted 5 lines

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".

Very nice! If my board would have already support for multiple boot sources, this would be a very good improvement for the user. Our downstream bootloader has that support and it always puzzled me whats MMC1, MMC2 and so on. In fact, theres two SPI boot sources there, which cannot be distinguished at all at the moment; they have different offsets for the same SPI flash.

Except for one nit below:

Quoted 27 lines
---
 common/spl/spl.c | 5 +++++
 include/spl.h    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
common/spl/spl.c +5 -0
index 4c101ec5d3..b7b53f352e 100644
@@ -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)

{

include/spl.h +0 -0
index 0af0ee3003..a7f17a3837 100644

include/spl.h void spl_board_prepare_for_optee(void *fdt); · line 461

Quoted 4 lines
include/spl.h +1 -0
@@ -458,6 +458,7 @@ void spl_board_prepare_for_optee(void *fdt);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);
 int spl_board_boot_device(u32 boot_device);
+const char *spl_board_loader_name(u32 boot_device);

function documentation maybe?

Quoted 13 lines
include/spl.h +3 -1
 /**
  * jump_to_image_linux() - Jump to a Linux kernel from SPL
@@ -541,7 +542,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;
Quoted 1 line

#endif

-michael