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>
This commit is contained in:
committed by
Isaac Christensen
parent
b77431336e
commit
1ee2c6dbdf
@@ -66,8 +66,8 @@ chtype fallback_acs_map[128] =
|
||||
'|', '<', '>', '*', '!', 'f', 'o', ' ',
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_SERIAL_ACS_FALLBACK
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_ACS_FALLBACK
|
||||
chtype serial_acs_map[128];
|
||||
#else
|
||||
/* See acsc of vt100. */
|
||||
@@ -93,7 +93,7 @@ chtype serial_acs_map[128] =
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_VIDEO_CONSOLE
|
||||
#ifdef CONFIG_LP_VIDEO_CONSOLE
|
||||
/* See acsc of linux. */
|
||||
chtype console_acs_map[128] =
|
||||
{
|
||||
@@ -122,10 +122,10 @@ void PDC_gotoyx(int row, int col)
|
||||
{
|
||||
PDC_LOG(("PDC_gotoyx() - called: row %d col %d\n", row, col));
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
serial_set_cursor(col, row);
|
||||
#endif
|
||||
#ifdef CONFIG_VIDEO_CONSOLE
|
||||
#ifdef CONFIG_LP_VIDEO_CONSOLE
|
||||
video_console_set_cursor(col, row);
|
||||
#endif
|
||||
}
|
||||
@@ -139,7 +139,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
|
||||
|
||||
PDC_LOG(("PDC_transform_line() - called: line %d, len %d, curses_flags %d\n", lineno, len, curses_flags));
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
int serial_is_bold = 0;
|
||||
int serial_is_reverse = 0;
|
||||
int serial_is_altcharset = 0;
|
||||
@@ -157,7 +157,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
|
||||
{
|
||||
ch = srcp[j];
|
||||
attr = ch;
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
if (curses_flags & F_ENABLE_SERIAL) {
|
||||
if (attr & A_BOLD) {
|
||||
if (!serial_is_bold) {
|
||||
@@ -222,7 +222,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
|
||||
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_VIDEO_CONSOLE
|
||||
#ifdef CONFIG_LP_VIDEO_CONSOLE
|
||||
unsigned char c = pdc_atrtab[srcp[j] >> PDC_ATTR_SHIFT];
|
||||
|
||||
if (curses_flags & F_ENABLE_CONSOLE) {
|
||||
|
@@ -5,7 +5,7 @@
|
||||
|
||||
unsigned long pdc_key_modifiers = 0L;
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef 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 */
|
||||
@@ -108,7 +108,7 @@ void PDC_set_keyboard_binary(bool on)
|
||||
|
||||
bool PDC_check_key(void)
|
||||
{
|
||||
#ifdef CONFIG_USB_HID
|
||||
#ifdef CONFIG_LP_USB_HID
|
||||
usb_poll();
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
usbhid_havechar()) {
|
||||
@@ -116,14 +116,14 @@ bool PDC_check_key(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PC_KEYBOARD
|
||||
#ifdef CONFIG_LP_PC_KEYBOARD
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
keyboard_havechar()) {
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
if ((curses_flags & F_ENABLE_SERIAL) &&
|
||||
serial_havechar()) {
|
||||
return TRUE;
|
||||
@@ -139,7 +139,7 @@ int PDC_get_key(void)
|
||||
{
|
||||
int c = 0;
|
||||
|
||||
#ifdef CONFIG_USB_HID
|
||||
#ifdef CONFIG_LP_USB_HID
|
||||
usb_poll();
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
usbhid_havechar()) {
|
||||
@@ -147,14 +147,14 @@ int PDC_get_key(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PC_KEYBOARD
|
||||
#ifdef CONFIG_LP_PC_KEYBOARD
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
keyboard_havechar() && (c==0)) {
|
||||
c = keyboard_getchar();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
if ((curses_flags & F_ENABLE_SERIAL) &&
|
||||
serial_havechar() && (c==0)) {
|
||||
c = cook_serial(serial_getchar());
|
||||
|
@@ -72,7 +72,7 @@ int PDC_scr_open(int argc, char **argv)
|
||||
SP->lines = PDC_get_rows();
|
||||
SP->cols = PDC_get_columns();
|
||||
|
||||
#ifdef CONFIG_SPEAKER
|
||||
#ifdef CONFIG_LP_SPEAKER
|
||||
SP->audible = TRUE;
|
||||
#endif
|
||||
|
||||
|
@@ -13,12 +13,12 @@ int PDC_curs_set(int visibility)
|
||||
ret_vis = SP->visibility;
|
||||
SP->visibility = visibility;
|
||||
|
||||
#ifdef CONFIG_SERIAL_CONSOLE
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
if (curses_flags & F_ENABLE_SERIAL) {
|
||||
serial_cursor_enable(visibility);
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_VIDEO_CONSOLE
|
||||
#ifdef CONFIG_LP_VIDEO_CONSOLE
|
||||
if (curses_flags & F_ENABLE_CONSOLE) {
|
||||
video_console_cursor_enable(visibility);
|
||||
}
|
||||
|
@@ -11,7 +11,7 @@ void PDC_beep(void)
|
||||
{
|
||||
PDC_LOG(("PDC_beep() - called\n"));
|
||||
|
||||
#ifdef CONFIG_SPEAKER
|
||||
#ifdef CONFIG_LP_SPEAKER
|
||||
speaker_tone(1760, 500); /* 1760 == note A6 */
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user