[PATCH v5 11/25] bloblist: Drop bloblist_maybe_init()
Simon Glass
sjg at chromium.org
Wed May 28 14:32:13 CEST 2025
The bloblist is not inited any earlier in the board_f sequence now, so
drop this function. Just use bloblist_init() instead.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v5:
- Add new patch to drop bloblist_maybe_init()
common/bloblist.c | 8 --------
common/board_f.c | 4 +++-
include/bloblist.h | 16 ----------------
3 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/common/bloblist.c b/common/bloblist.c
index c7322b96bcb..ac3fd3b64ee 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -580,14 +580,6 @@ int bloblist_init(void)
return 0;
}
-int bloblist_maybe_init(void)
-{
- if (CONFIG_IS_ENABLED(BLOBLIST) && !(gd->flags & GD_FLG_BLOBLIST_READY))
- return bloblist_init();
-
- return 0;
-}
-
int bloblist_check_reg_conv(ulong rfdt, ulong rzero, ulong rsig, ulong xlist)
{
u64 version = BLOBLIST_REGCONV_VER;
diff --git a/common/board_f.c b/common/board_f.c
index e9ffa2d7fed..006a1717c29 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -910,7 +910,9 @@ static void initcall_run_f(void)
INITCALL(log_init);
INITCALL(initf_bootstage); /* uses its own timer, so does not need DM */
INITCALL(event_init);
- INITCALL(bloblist_maybe_init);
+#if CONFIG_IS_ENABLED(BLOBLIST)
+ INITCALL(bloblist_init);
+#endif
INITCALL(setup_spl_handoff);
#if CONFIG_IS_ENABLED(CONSOLE_RECORD_INIT_F)
INITCALL(console_record_init);
diff --git a/include/bloblist.h b/include/bloblist.h
index f32faf78560..04d72e786f2 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -476,22 +476,6 @@ int bloblist_reloc(void *to, uint to_size);
*/
int bloblist_init(void);
-#if CONFIG_IS_ENABLED(BLOBLIST)
-/**
- * bloblist_maybe_init() - Init the bloblist system if not already done
- *
- * Calls bloblist_init() if the GD_FLG_BLOBLIST_READY flag is not set
- *
- * Return: 0 if OK, -ve on error
- */
-int bloblist_maybe_init(void);
-#else
-static inline int bloblist_maybe_init(void)
-{
- return 0;
-}
-#endif /* BLOBLIST */
-
/**
* bloblist_check_reg_conv() - Check whether the bloblist is compliant to
* the register conventions according to the
--
2.43.0
More information about the U-Boot
mailing list