erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.

Browse source 
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_.

BUG=chrome-os-partner:19420
TEST=Built and booted on pit. Built libpayload and depthcharge on all
supported platforms.
BRANCH=None

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>
This commit is contained in:
Gabe Black 2013-08-09 04:27:35 -07:00 • committed by ChromeBot
commit 23e866da20
68 changed files with 947 additions and 946 deletions
Download patch file Download diff file Expand all files Collapse all files

8
payloads/libpayload/include/sysinfo.h
View file

@ -63,7 +63,7 @@ struct sysinfo_t {
u32 cmos_range_start;
u32 cmos_range_end;
u32 cmos_checksum_location;
#ifdef CONFIG_CHROMEOS
#ifdef CONFIG_LP_CHROMEOS
u32 vbnv_start;
u32 vbnv_size;
#endif
@ -83,7 +83,7 @@ struct sysinfo_t {
struct cb_framebuffer *framebuffer;
#ifdef CONFIG_CHROMEOS
#ifdef CONFIG_LP_CHROMEOS
int num_gpios;
struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
#endif
@ -93,14 +93,14 @@ struct sysinfo_t {
struct cb_header *header;
struct cb_mainboard *mainboard;
#ifdef CONFIG_CHROMEOS
#ifdef CONFIG_LP_CHROMEOS
void *vboot_handoff;
u32 vboot_handoff_size;
void *vdat_addr;
u32 vdat_size;
#endif
#ifdef CONFIG_ARCH_X86
#ifdef CONFIG_LP_ARCH_X86
int x86_rom_var_mtrr_index;
#endif