From 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 9 Aug 2013 04:27:35 -0700 Subject: 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 Reviewed-on: https://gerrit.chromium.org/gerrit/65303 Reviewed-by: Stefan Reinauer Tested-by: Gabe Black Commit-Queue: Gabe Black (cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6427 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Marc Jones --- payloads/libpayload/curses/local.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload/curses/local.h') diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h index b7c459d2a0..73fb005c5a 100644 --- a/payloads/libpayload/curses/local.h +++ b/payloads/libpayload/curses/local.h @@ -70,13 +70,13 @@ /* Flags used to determine what output methods are available */ -#ifdef CONFIG_VIDEO_CONSOLE +#ifdef CONFIG_LP_VIDEO_CONSOLE #define F_ENABLE_CONSOLE 0x01 #else #define F_ENABLE_CONSOLE 0x00 #endif -#ifdef CONFIG_SERIAL_CONSOLE +#ifdef CONFIG_LP_SERIAL_CONSOLE #define F_ENABLE_SERIAL 0x02 #else #define F_ENABLE_SERIAL 0x00 -- cgit v1.2.3