Hi Jonas,
On 2026-07-08T22:05:26, Jonas Karlman <[email protected]> wrote:
> console: Use CONFIG_IS_ENABLED() for SILENT_CONSOLE checks
>
> The xPL_SILENT_CONSOLE Kconfig symbols are not fully respected for xPL
> builds, instead common code is guarded by a mix of SILENT_CONSOLE and
> xPL_SILENT_CONSOLE symbols.
>
> Change to consistently use CONFIG_IS_ENABLED(SILENT_CONSOLE) to make the
> common code properly guarded by the intended Kconfig symbol.
>
> Signed-off-by: Jonas Karlman <[email protected]>
> Reviewed-by: Tom Rini <[email protected]>
>
> board/friendlyarm/nanopi2/board.c | 4 ++--
> boot/bootm.c | 4 ++--
> common/autoboot.c | 2 +-
> common/console.c | 12 ++++++------
> include/env_callback.h | 2 +-
> 5 files changed, 12 insertions(+), 12 deletions(-)
> diff --git a/common/console.c b/common/console.c
> @@ -736,7 +736,7 @@ void putc(const char c)
> - if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && (gd->flags & GD_FLG_SILENT)) {
> + if (CONFIG_IS_ENABLED(SILENT_CONSOLE) && (gd->flags & GD_FLG_SILENT)) {
This slightly changes what SPL_SILENT_CONSOLE means. Previously the
xPL symbol only dropped the boot-progress messages in spl.c at build
time, but now it also gates the run-time GD_FLG_SILENT checks here
when console.c is built for SPL (i.e. with SPL_SERIAL). The help text
in common/Kconfig still says "The GD_FLG_SILENT flag is not used in
SPL so there is no run-time control of console messages in SPL", which
no longer matches. Please can you update the SPL_SILENT_CONSOLE and
TPL_SILENT_CONSOLE help text?
> diff --git a/common/console.c b/common/console.c
> @@ -72,7 +72,7 @@ static int on_console(const char *name, const char *value,
> enum env_op op,
> -#ifdef CONFIG_SILENT_CONSOLE
> +#if CONFIG_IS_ENABLED(SILENT_CONSOLE)
Just to check: there is no VPL_SILENT_CONSOLE symbol, so in a VPL
build this (and the other converted checks) is now always false, where
before it followed the proper symbol. I suspect that is fine since no
in-tree board enables both VPL and SILENT_CONSOLE, but please mention
it in the commit message, or add the VPL symbol alongside the SPL/TPL
ones in common/Kconfig
Regards,
Simon
