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>
This commit is contained in:
Ovidiu Panait 2020-11-28 10:43:03 +02:00 committed by Tom Rini
parent c698b998bb
commit 4e81920ba8
2 changed files with 11 additions and 4 deletions

View File

@ -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

View File

@ -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)