[U-Boot] [PATCH] common: console: Fix duplicated CONFIG in silent env callback

The silent environment callback function does not update the silent flag during silent env set or unset. That is because of duplicated CONFIG keyword at preprocessor condition in silent environment callback function and cause silent env callback unable to work.
This patch is to remove the duplicated CONFIG keywork in silent environment callback function.
Signed-off-by: Wilson Lee wilson.lee@ni.com Cc: Keng Soon Cheah keng.soon.cheah@ni.com Cc: Chen Yee Chew chen.yee.chew@ni.com Cc: Joe Hershberger joe.hershberger@ni.com ---
common/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/console.c b/common/console.c index 3167921..f83528c 100644 --- a/common/console.c +++ b/common/console.c @@ -68,11 +68,11 @@ U_BOOT_ENV_CALLBACK(console, on_console); static int on_silent(const char *name, const char *value, enum env_op op, int flags) { -#if !CONFIG_IS_ENABLED(CONFIG_SILENT_CONSOLE_UPDATE_ON_SET) +#if !CONFIG_IS_ENABLED(SILENT_CONSOLE_UPDATE_ON_SET) if (flags & H_INTERACTIVE) return 0; #endif -#if !CONFIG_IS_ENABLED(CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC) +#if !CONFIG_IS_ENABLED(SILENT_CONSOLE_UPDATE_ON_RELOC) if ((flags & H_INTERACTIVE) == 0) return 0; #endif

On Fri, Aug 25, 2017 at 2:06 AM, Wilson Lee wilson.lee@ni.com wrote:
The silent environment callback function does not update the silent flag during silent env set or unset. That is because of duplicated CONFIG keyword at preprocessor condition in silent environment callback function and cause silent env callback unable to work.
This patch is to remove the duplicated CONFIG keywork in silent environment callback function.
Signed-off-by: Wilson Lee wilson.lee@ni.com Cc: Keng Soon Cheah keng.soon.cheah@ni.com Cc: Chen Yee Chew chen.yee.chew@ni.com Cc: Joe Hershberger joe.hershberger@ni.com
Reviewed-by: Joe Hershberger joe.hershberger@ni.com

On Fri, Aug 25, 2017 at 12:06:29AM -0700, Wilson Lee wrote:
The silent environment callback function does not update the silent flag during silent env set or unset. That is because of duplicated CONFIG keyword at preprocessor condition in silent environment callback function and cause silent env callback unable to work.
This patch is to remove the duplicated CONFIG keywork in silent environment callback function.
Signed-off-by: Wilson Lee wilson.lee@ni.com Cc: Keng Soon Cheah keng.soon.cheah@ni.com Cc: Chen Yee Chew chen.yee.chew@ni.com Cc: Joe Hershberger joe.hershberger@ni.com
Applied to u-boot/master, thanks!
participants (3)
-
Joe Hershberger
-
Tom Rini
-
Wilson Lee