commit 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f
author Gabe Black <gabeblack@google.com> Fri Aug 09 04:27:35 2013 -0700
committer Isaac Christensen <isaac.christensen@se-eng.com> Tue Aug 05 18:44:08 2014 +0200
tree fabae429ff872caed315281a0c243fa0bd753565
parent b77431336e44ba9721f18220e2a7dedafe250528

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>

payloads/libpayload/bin/lpgcc

diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index 4eca091..32ec568 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -68,14 +68,14 @@
 	exit 1
 fi
 
-if [ "$CONFIG_ARCH_ARMV7" = "y" ]; then
+if [ "$CONFIG_LP_ARCH_ARMV7" = "y" ]; then
   _ARCHINCDIR=$_INCDIR/armv7
   _ARCHLIBDIR=$_LIBDIR/armv7
   _ARCHEXTRA=""
   _ARCH=armv7
 fi
 
-if [ "$CONFIG_ARCH_X86" = "y" ]; then
+if [ "$CONFIG_LP_ARCH_X86" = "y" ]; then
   _ARCHINCDIR=$_INCDIR/x86
   _ARCHLIBDIR=$_LIBDIR/x86
   _ARCHEXTRA="-m32 "
@@ -135,11 +135,11 @@
 
 _CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$BASE/../build -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1"
 
-if [ "$CONFIG_PDCURSES" = y ]; then
+if [ "$CONFIG_LP_PDCURSES" = y ]; then
   _CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses-3.4"
 fi
 
-if [ "$CONFIG_TINYCURSES" = y ]; then
+if [ "$CONFIG_LP_TINYCURSES" = y ]; then
   _CFLAGS="$_CFLAGS -I$BASE/../curses"
 fi