commit 1b4d39428eac80bc76713b1f21a2c85e8900c1b8
author Stefan Reinauer <stefan.reinauer@coreboot.org> Mon Jun 29 15:47:34 2015 -0700
committer Stefan Reinauer <stefan.reinauer@coreboot.org> Tue Jun 30 18:55:15 2015 +0200
tree e2b9dfea6be47c785fa55964950c691643d0a232
parent de60c8899680f362a908d68efe9e4154ab3380be

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>

payloads/libpayload/curses/keyboard.c

diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c
index 315653b..f571d56 100644
--- a/payloads/libpayload/curses/keyboard.c
+++ b/payloads/libpayload/curses/keyboard.c
@@ -45,7 +45,7 @@
 
 /* ============== Serial ==================== */
 
-#ifdef CONFIG_LP_SERIAL_CONSOLE
+#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
 /* We treat serial like a vt100 terminal.  For now we
    do the cooking in here, but we should probably eventually
    pass it to dedicated vt100 code */
@@ -146,12 +146,13 @@
 
 static int curses_getchar(int _delay)
 {
-#if defined(CONFIG_LP_USB_HID) || defined(CONFIG_LP_PC_KEYBOARD) || defined(CONFIG_LP_SERIAL_CONSOLE)
+#if IS_ENABLED(CONFIG_LP_USB_HID) || IS_ENABLED(CONFIG_LP_PC_KEYBOARD) || \
+	IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
 	unsigned short c;
 #endif
 
 	do {
-#ifdef CONFIG_LP_USB_HID
+#if IS_ENABLED(CONFIG_LP_USB_HID)
 		usb_poll();
 		if ((curses_flags & F_ENABLE_CONSOLE) &&
 		    usbhid_havechar()) {
@@ -159,7 +160,7 @@
 			if (c != 0) return c;
 		}
 #endif
-#ifdef CONFIG_LP_PC_KEYBOARD
+#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD)
 		if ((curses_flags & F_ENABLE_CONSOLE) &&
 		    keyboard_havechar()) {
 			c = keyboard_getchar();
@@ -167,7 +168,7 @@
 		}
 #endif
 
-#ifdef CONFIG_LP_SERIAL_CONSOLE
+#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
 		if ((curses_flags & F_ENABLE_SERIAL) &&
 		    serial_havechar()) {
 			c = serial_getchar();
@@ -225,7 +226,7 @@
 	return 0;
 }
 
-#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
+#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE)
 void curses_enable_vga(int state)
 {
 	if (state)
@@ -243,7 +244,7 @@
 int curses_vga_enabled(void) { return 0; }
 #endif
 
-#ifdef CONFIG_LP_SERIAL_CONSOLE
+#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
 void curses_enable_serial(int state)
 {
 	if (state)