common: Kconfig: Introduce CONFIG_CONSOLE_RECORD_INIT_F

Currently, the following #ifdef construct is used to check whether to run
console_record_init() during pre-relocation init:
 defined(CONFIG_CONSOLE_RECORD) && CONFIG_VAL(SYS_MALLOC_F_LEN)

Introduce CONFIG_CONSOLE_RECORD_INIT_F Kconfig option to get rid of the
complex ifdef check. Also, use IS_ENABLED() instead of #ifdef.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 2bce8c9ba1b99a7ff69a831311a264d1cb88da92..d8982ba37761615e8cabbe4d77cf3e16ca694cb1 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,14 @@ config CONSOLE_RECORD
          To enable console recording, call console_record_reset_enable()
          from your code.
 
+config CONSOLE_RECORD_INIT_F
+       bool "Enable console recording during pre-relocation init"
+       depends on CONSOLE_RECORD && SYS_MALLOC_F
+       default y
+       help
+         This option enables console recording during pre-relocation init.
+         CONFIG_SYS_MALLOC_F must be enabled to use this feature.
+
 config CONSOLE_RECORD_OUT_SIZE
        hex "Output buffer size"
        depends on CONSOLE_RECORD

diff --git a/common/board_f.c b/common/board_f.c
index 9f441c44f176ec7c3e590009d42b636347eb94af..e5e69ff0fadf078bc675df7039d5a969afcecb03 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -767,11 +767,10 @@ static int initf_bootstage(void)
 
 static int initf_console_record(void)
 {
-#if defined(CONFIG_CONSOLE_RECORD) && CONFIG_VAL(SYS_MALLOC_F_LEN)
-       return console_record_init();
-#else
+       if (IS_ENABLED(CONFIG_CONSOLE_RECORD_INIT_F))
+               return console_record_init();
+
        return 0;
-#endif
 }
 
 static int initf_dm(void)