summaryrefslogtreecommitdiff
path: root/common/stdio.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-10-17 20:13:02 -0600
committerTom Rini <trini@konsulko.com>2016-10-23 18:34:17 -0400
commit869588decdf41b693c8977067f90f742b771d0ad (patch)
tree2f845d9c8c5359adc0e1ed7459dba018d1fa16f7 /common/stdio.c
parent4ef6ecec9cdf1ce4c7b4f2a6b0f903583bfa24a2 (diff)
Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig
This converts the following to Kconfig: CONFIG_SYS_STDIO_DEREGISTER This option should never be enabled in SPL, so use CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Re-sync] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/stdio.c')
-rw-r--r--common/stdio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/stdio.c b/common/stdio.c
index ab9b05df48a..8e4a9beef45 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -37,7 +37,7 @@ char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
@@ -245,7 +245,7 @@ int stdio_register(struct stdio_dev *dev)
/* deregister the device "devname".
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
int stdio_deregister_dev(struct stdio_dev *dev, int force)
{
int l;
@@ -292,7 +292,7 @@ int stdio_deregister(const char *devname, int force)
return stdio_deregister_dev(dev, force);
}
-#endif /* CONFIG_SYS_STDIO_DEREGISTER */
+#endif /* CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) */
int stdio_init_tables(void)
{