mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-04 01:53:27 +08:00
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>
This commit is contained in:
parent
dd027dde75
commit
5daf6e56d3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user