summaryrefslogtreecommitdiff
path: root/common/console.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-10-17 20:12:35 -0600
committerTom Rini <trini@konsulko.com>2016-10-23 18:33:18 -0400
commit98af87997670af840ef178f76b4d6888534a6700 (patch)
tree5206afd6aff96620267f7daa62534bca782c459f /common/console.c
parent53302bdc480ac8c36ec4da8bd444c63f7872ba02 (diff)
Convert SILENT_CONSOLE options to Kconfig
Move these option to Kconfig and tidy up existing uses. The Power PC boards don't have a suitable common element: the common header files don't appear to line up with the Kconfig files as far as I can tell. This results in a lot of defconfig changes. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jteki@openedev.com> [trini: Re-migrate, update common/console.c logic] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/console.c')
-rw-r--r--common/console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c
index f38f71f819..282fcc8832 100644
--- a/common/console.c
+++ b/common/console.c
@@ -66,11 +66,11 @@ U_BOOT_ENV_CALLBACK(console, on_console);
static int on_silent(const char *name, const char *value, enum env_op op,
int flags)
{
-#ifndef CONFIG_SILENT_CONSOLE_UPDATE_ON_SET
+#if !CONFIG_IS_ENABLED(CONFIG_SILENT_CONSOLE_UPDATE_ON_SET)
if (flags & H_INTERACTIVE)
return 0;
#endif
-#ifndef CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC
+#if !CONFIG_IS_ENABLED(CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC)
if ((flags & H_INTERACTIVE) == 0)
return 0;
#endif