diff options
| author | Gabe Black <gabeblack@google.com> | 2013-08-09 04:27:35 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-05 18:44:08 +0200 |
| commit | 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch) | |
| tree | fabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/libc/console.c | |
| parent | b77431336e44ba9721f18220e2a7dedafe250528 (diff) | |
libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.
When libpayload header files are included in the payload itself, it's possible
that the payloads config settings will conflict with the ones in libpayload.
It's also possible for the libpayload config settings to conflict with the
payloads. To avoid that, the libpayload config settings have _LP_ (for
libpayload) added to them. The symbols themselves as defined in the Config.in files
are still the same, but the prefix added to them is now CONFIG_LP_ instead of just
CONFIG_.
Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65303
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6427
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'payloads/libpayload/libc/console.c')
| -rw-r--r-- | payloads/libpayload/libc/console.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c index 54844db79b..a362481b15 100644 --- a/payloads/libpayload/libc/console.c +++ b/payloads/libpayload/libc/console.c @@ -49,16 +49,16 @@ void console_add_input_driver(struct console_input_driver *in) void console_init(void) { -#ifdef CONFIG_VIDEO_CONSOLE +#ifdef CONFIG_LP_VIDEO_CONSOLE video_console_init(); #endif -#ifdef CONFIG_SERIAL_CONSOLE +#ifdef CONFIG_LP_SERIAL_CONSOLE serial_init(); #endif -#ifdef CONFIG_PC_KEYBOARD +#ifdef CONFIG_LP_PC_KEYBOARD keyboard_init(); #endif -#ifdef CONFIG_CBMEM_CONSOLE +#ifdef CONFIG_LP_CBMEM_CONSOLE cbmem_console_init(); #endif } @@ -94,7 +94,7 @@ int puts(const char *s) int havekey(void) { -#ifdef CONFIG_USB +#ifdef CONFIG_LP_USB usb_poll(); #endif struct console_input_driver *in; @@ -111,7 +111,7 @@ int havekey(void) int getchar(void) { while (1) { -#ifdef CONFIG_USB +#ifdef CONFIG_LP_USB usb_poll(); #endif struct console_input_driver *in; |