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:
Gabe Black
2013-08-09 04:27:35 -07:00
committed by Isaac Christensen
parent b77431336e
commit 1ee2c6dbdf
58 changed files with 523 additions and 522 deletions

View File

@@ -27,142 +27,142 @@
## SUCH DAMAGE.
##
ifeq ($(CONFIG_TINYCURSES),y)
ifeq ($(CONFIG_LP_TINYCURSES),y)
INCLUDES += -Icurses
endif
libcurses-$(CONFIG_TINYCURSES) += keyboard.c
libcurses-$(CONFIG_TINYCURSES) += tinycurses.c
libcurses-$(CONFIG_TINYCURSES) += colors.c
libcurses-$(CONFIG_LP_TINYCURSES) += keyboard.c
libcurses-$(CONFIG_LP_TINYCURSES) += tinycurses.c
libcurses-$(CONFIG_LP_TINYCURSES) += colors.c
includes-$(CONFIG_TINYCURSES) += curses.h
includes-$(CONFIG_LP_TINYCURSES) += curses.h
ifeq ($(CONFIG_PDCURSES),y)
ifeq ($(CONFIG_LP_PDCURSES),y)
INCLUDES += -D_LP64=0 -Icurses/PDCurses-3.4 -Icurses/pdcurses-backend -Icurses/menu -Icurses/form
endif
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdcdisp.c
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdcgetsc.c
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdckbd.c
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdcscrn.c
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdcsetsc.c
libcurses-$(CONFIG_PDCURSES) += pdcurses-backend/pdcutil.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/addch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/move.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/overlay.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/refresh.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/terminfo.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/window.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/util.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/inopts.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/addstr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/keyname.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/instr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/clear.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/addchstr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/kernel.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/pad.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/insstr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/border.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/getyx.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/getstr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/getch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/termattr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/outopts.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/color.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/deleteln.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/initscr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/slk.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/delch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/touch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/mouse.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/scanw.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/scroll.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/printw.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/bkgd.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/inch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/attr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/insch.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/inchstr.c
libcurses-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/beep.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcdisp.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcgetsc.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdckbd.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcscrn.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcsetsc.c
libcurses-$(CONFIG_LP_PDCURSES) += pdcurses-backend/pdcutil.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/move.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/overlay.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/refresh.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/terminfo.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/window.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/util.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inopts.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addstr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/keyname.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/instr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/clear.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/addchstr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/kernel.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/pad.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/insstr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/border.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getyx.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getstr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/getch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/termattr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/outopts.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/color.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/deleteln.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/initscr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/slk.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/delch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/touch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/mouse.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/scanw.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/scroll.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/printw.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/bkgd.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/attr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/insch.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/inchstr.c
libcurses-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/beep.c
includes-$(CONFIG_PDCURSES) += pdcurses-backend/nc_alloc.h
includes-$(CONFIG_PDCURSES) += pdcurses-backend/ncurses_cfg.h
includes-$(CONFIG_PDCURSES) += PDCurses-3.4/curses.h
includes-$(CONFIG_PDCURSES) += PDCurses-3.4/term.h
includes-$(CONFIG_PDCURSES) += PDCurses-3.4/panel.h
includes-$(CONFIG_PDCURSES) += menu/eti.h
includes-$(CONFIG_PDCURSES) += menu/menu.h
includes-$(CONFIG_PDCURSES) += menu/mf_common.h
includes-$(CONFIG_PDCURSES) += form/form.h
includes-$(CONFIG_LP_PDCURSES) += pdcurses-backend/nc_alloc.h
includes-$(CONFIG_LP_PDCURSES) += pdcurses-backend/ncurses_cfg.h
includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/curses.h
includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/term.h
includes-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/panel.h
includes-$(CONFIG_LP_PDCURSES) += menu/eti.h
includes-$(CONFIG_LP_PDCURSES) += menu/menu.h
includes-$(CONFIG_LP_PDCURSES) += menu/mf_common.h
includes-$(CONFIG_LP_PDCURSES) += form/form.h
libpanel-$(CONFIG_PDCURSES) += PDCurses-3.4/pdcurses/panel.c
libpanel-$(CONFIG_LP_PDCURSES) += PDCurses-3.4/pdcurses/panel.c
libmenu-$(CONFIG_PDCURSES) += menu/m_req_name.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_nam.c
libmenu-$(CONFIG_PDCURSES) += menu/m_pad.c
libmenu-$(CONFIG_PDCURSES) += menu/m_cursor.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_new.c
libmenu-$(CONFIG_PDCURSES) += menu/m_attribs.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_opt.c
libmenu-$(CONFIG_PDCURSES) += menu/m_format.c
libmenu-$(CONFIG_PDCURSES) += menu/m_post.c
libmenu-$(CONFIG_PDCURSES) += menu/m_userptr.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_cur.c
libmenu-$(CONFIG_PDCURSES) += menu/m_driver.c
libmenu-$(CONFIG_PDCURSES) += menu/m_sub.c
libmenu-$(CONFIG_PDCURSES) += menu/m_win.c
libmenu-$(CONFIG_PDCURSES) += menu/m_global.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_vis.c
libmenu-$(CONFIG_PDCURSES) += menu/m_new.c
libmenu-$(CONFIG_PDCURSES) += menu/m_scale.c
libmenu-$(CONFIG_PDCURSES) += menu/m_spacing.c
libmenu-$(CONFIG_PDCURSES) += menu/m_opts.c
libmenu-$(CONFIG_PDCURSES) += menu/m_pattern.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_val.c
libmenu-$(CONFIG_PDCURSES) += menu/m_hook.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_use.c
libmenu-$(CONFIG_PDCURSES) += menu/m_items.c
libmenu-$(CONFIG_PDCURSES) += menu/m_item_top.c
libform-$(CONFIG_PDCURSES) += form/frm_page.c
libform-$(CONFIG_PDCURSES) += form/frm_opts.c
libform-$(CONFIG_PDCURSES) += form/frm_def.c
libform-$(CONFIG_PDCURSES) += form/frm_req_name.c
libform-$(CONFIG_PDCURSES) += form/fty_alpha.c
libform-$(CONFIG_PDCURSES) += form/frm_driver.c
libform-$(CONFIG_PDCURSES) += form/fld_user.c
libform-$(CONFIG_PDCURSES) += form/frm_win.c
libform-$(CONFIG_PDCURSES) += form/fld_newftyp.c
#libform-$(CONFIG_PDCURSES) += form/fty_regex.c
libform-$(CONFIG_PDCURSES) += form/fld_stat.c
libform-$(CONFIG_PDCURSES) += form/fld_pad.c
libform-$(CONFIG_PDCURSES) += form/fld_current.c
libform-$(CONFIG_PDCURSES) += form/frm_post.c
#libform-$(CONFIG_PDCURSES) += form/f_trace.c
libform-$(CONFIG_PDCURSES) += form/fty_generic.c
libform-$(CONFIG_PDCURSES) += form/fld_page.c
libform-$(CONFIG_PDCURSES) += form/frm_hook.c
libform-$(CONFIG_PDCURSES) += form/frm_scale.c
libform-$(CONFIG_PDCURSES) += form/fty_int.c
libform-$(CONFIG_PDCURSES) += form/fty_alnum.c
libform-$(CONFIG_PDCURSES) += form/frm_cursor.c
#libform-$(CONFIG_PDCURSES) += form/fty_ipv4.c
libform-$(CONFIG_PDCURSES) += form/fld_link.c
libform-$(CONFIG_PDCURSES) += form/fld_arg.c
libform-$(CONFIG_PDCURSES) += form/fld_move.c
libform-$(CONFIG_PDCURSES) += form/fld_def.c
libform-$(CONFIG_PDCURSES) += form/fld_type.c
libform-$(CONFIG_PDCURSES) += form/fld_max.c
libform-$(CONFIG_PDCURSES) += form/fld_ftlink.c
libform-$(CONFIG_PDCURSES) += form/fld_ftchoice.c
libform-$(CONFIG_PDCURSES) += form/fld_info.c
libform-$(CONFIG_PDCURSES) += form/frm_user.c
#libform-$(CONFIG_PDCURSES) += form/fty_num.c
libform-$(CONFIG_PDCURSES) += form/frm_sub.c
libform-$(CONFIG_PDCURSES) += form/fty_enum.c
libform-$(CONFIG_PDCURSES) += form/frm_data.c
libform-$(CONFIG_PDCURSES) += form/fld_opts.c
libform-$(CONFIG_PDCURSES) += form/fld_attr.c
libform-$(CONFIG_PDCURSES) += form/fld_dup.c
libform-$(CONFIG_PDCURSES) += form/fld_just.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_req_name.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_nam.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_pad.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_cursor.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_new.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_attribs.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_opt.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_format.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_post.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_userptr.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_cur.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_driver.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_sub.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_win.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_global.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_vis.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_new.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_scale.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_spacing.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_opts.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_pattern.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_val.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_hook.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_use.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_items.c
libmenu-$(CONFIG_LP_PDCURSES) += menu/m_item_top.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_page.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_opts.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_def.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_req_name.c
libform-$(CONFIG_LP_PDCURSES) += form/fty_alpha.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_driver.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_user.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_win.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_newftyp.c
#libform-$(CONFIG_LP_PDCURSES) += form/fty_regex.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_stat.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_pad.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_current.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_post.c
#libform-$(CONFIG_LP_PDCURSES) += form/f_trace.c
libform-$(CONFIG_LP_PDCURSES) += form/fty_generic.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_page.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_hook.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_scale.c
libform-$(CONFIG_LP_PDCURSES) += form/fty_int.c
libform-$(CONFIG_LP_PDCURSES) += form/fty_alnum.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_cursor.c
#libform-$(CONFIG_LP_PDCURSES) += form/fty_ipv4.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_link.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_arg.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_move.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_def.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_type.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_max.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_ftlink.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_ftchoice.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_info.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_user.c
#libform-$(CONFIG_LP_PDCURSES) += form/fty_num.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_sub.c
libform-$(CONFIG_LP_PDCURSES) += form/fty_enum.c
libform-$(CONFIG_LP_PDCURSES) += form/frm_data.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_opts.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_attr.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_dup.c
libform-$(CONFIG_LP_PDCURSES) += form/fld_just.c