[RESEND PATCH 06/18] common: board_r: Drop initr_console_record wrapper
Ovidiu Panait
ovidiu.panait at windriver.com
Sat Jan 16 17:08:42 CET 2021
Drop initr_console_record wrapper and call console_record_init directly.
Signed-off-by: Ovidiu Panait <ovidiu.panait at windriver.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
common/board_r.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/common/board_r.c b/common/board_r.c
index 29dd7d26d9..07c0ad363e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -282,15 +282,6 @@ static int initr_malloc(void)
return 0;
}
-static int initr_console_record(void)
-{
-#if defined(CONFIG_CONSOLE_RECORD)
- return console_record_init();
-#else
- return 0;
-#endif
-}
-
#ifdef CONFIG_SYS_NONCACHED_MEMORY
static int initr_noncached(void)
{
@@ -713,7 +704,9 @@ static init_fnc_t init_sequence_r[] = {
initr_malloc,
log_init,
initr_bootstage, /* Needs malloc() but has its own timer */
- initr_console_record,
+#if defined(CONFIG_CONSOLE_RECORD)
+ console_record_init,
+#endif
#ifdef CONFIG_SYS_NONCACHED_MEMORY
initr_noncached,
#endif
--
2.17.1
More information about the U-Boot
mailing list