diff options
| author | Wilson Lee <wilson.lee@ni.com> | 2017-08-25 00:06:29 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-28 07:19:12 -0400 |
| commit | 5daf6e56d36ccbdb7a3b160f9bd0f0c572c18eaf (patch) | |
| tree | 27fa220eda8ee679f2ac419a7cb63030cec56eef | |
| parent | dd027dde75dc55e7713b33d7e4f5adb1601a218a (diff) | |
| download | u-boot-5daf6e56d36ccbdb7a3b160f9bd0f0c572c18eaf.zip u-boot-5daf6e56d36ccbdb7a3b160f9bd0f0c572c18eaf.tar.gz u-boot-5daf6e56d36ccbdb7a3b160f9bd0f0c572c18eaf.tar.bz2 | |
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>
| -rw-r--r-- | common/console.c | 4 |
1 files 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 |