aboutsummaryrefslogtreecommitdiff
path: root/payloads/libpayload/libc/console.c
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-29 15:47:34 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-30 18:55:15 +0200
commit1b4d39428eac80bc76713b1f21a2c85e8900c1b8 (patch)
treee2b9dfea6be47c785fa55964950c691643d0a232 /payloads/libpayload/libc/console.c
parentde60c8899680f362a908d68efe9e4154ab3380be (diff)
libpayload: Make Kconfig bools use IS_ENABLED()
This will make the code work with the different styles of Kconfig (emit unset bools vs don't emit unset bools) Roughly, the patch does this, and a little bit of fixing up: perl -pi -e 's,ifdef (CONFIG_LP_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]` perl -pi -e 's,ifndef (CONFIG_LP_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]` Change-Id: Ib8a839b056a1f806a8597052e1b571ea3d18a79f Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/10711 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/libc/console.c')
-rw-r--r--payloads/libpayload/libc/console.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c
index 7717daf5d1..caeb582945 100644
--- a/payloads/libpayload/libc/console.c
+++ b/payloads/libpayload/libc/console.c
@@ -99,16 +99,16 @@ int console_remove_output_driver(void *function)
void console_init(void)
{
-#ifdef CONFIG_LP_VIDEO_CONSOLE
+#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE)
video_console_init();
#endif
-#ifdef CONFIG_LP_SERIAL_CONSOLE
+#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
serial_console_init();
#endif
-#ifdef CONFIG_LP_PC_KEYBOARD
+#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD)
keyboard_init();
#endif
-#ifdef CONFIG_LP_CBMEM_CONSOLE
+#if IS_ENABLED(CONFIG_LP_CBMEM_CONSOLE)
cbmem_console_init();
#endif
}
@@ -144,7 +144,7 @@ int puts(const char *s)
int havekey(void)
{
-#ifdef CONFIG_LP_USB
+#if IS_ENABLED(CONFIG_LP_USB)
usb_poll();
#endif
struct console_input_driver *in;
@@ -161,7 +161,7 @@ int havekey(void)
int getchar(void)
{
while (1) {
-#ifdef CONFIG_LP_USB
+#if IS_ENABLED(CONFIG_LP_USB)
usb_poll();
#endif
struct console_input_driver *in;