diff options
| author | Gabe Black <gabeblack@google.com> | 2013-08-09 04:27:35 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-05 18:44:08 +0200 |
| commit | 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch) | |
| tree | fabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/configs/config.panther | |
| parent | b77431336e44ba9721f18220e2a7dedafe250528 (diff) | |
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>
Diffstat (limited to 'payloads/libpayload/configs/config.panther')
| -rw-r--r-- | payloads/libpayload/configs/config.panther | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/payloads/libpayload/configs/config.panther b/payloads/libpayload/configs/config.panther index 005c6eb71d..ec0f11d8bd 100644 --- a/payloads/libpayload/configs/config.panther +++ b/payloads/libpayload/configs/config.panther @@ -7,65 +7,65 @@ # # Generic Options # -# CONFIG_EXPERIMENTAL is not set -# CONFIG_OBSOLETE is not set -# CONFIG_DEVELOPER is not set -CONFIG_CHROMEOS=y +# CONFIG_LP_EXPERIMENTAL is not set +# CONFIG_LP_OBSOLETE is not set +# CONFIG_LP_DEVELOPER is not set +CONFIG_LP_CHROMEOS=y # # Architecture Options # -# CONFIG_ARCH_ARMV7 is not set -# CONFIG_ARCH_POWERPC is not set -CONFIG_ARCH_X86=y -# CONFIG_MEMMAP_RAM_ONLY is not set -# CONFIG_MULTIBOOT is not set +# CONFIG_LP_ARCH_ARMV7 is not set +# CONFIG_LP_ARCH_POWERPC is not set +CONFIG_LP_ARCH_X86=y +# CONFIG_LP_MEMMAP_RAM_ONLY is not set +# CONFIG_LP_MULTIBOOT is not set # # Standard Libraries # -CONFIG_LIBC=y -# CONFIG_CURSES is not set -CONFIG_CBFS=y -CONFIG_LZMA=y +CONFIG_LP_LIBC=y +# CONFIG_LP_CURSES is not set +CONFIG_LP_CBFS=y +CONFIG_LP_LZMA=y # # Console Options # -CONFIG_SKIP_CONSOLE_INIT=y -CONFIG_CBMEM_CONSOLE=y -CONFIG_SERIAL_CONSOLE=y -CONFIG_8250_SERIAL_CONSOLE=y -CONFIG_SERIAL_IOBASE=0x3f8 -# CONFIG_SERIAL_SET_SPEED is not set -# CONFIG_SERIAL_ACS_FALLBACK is not set -CONFIG_VIDEO_CONSOLE=y -# CONFIG_VGA_VIDEO_CONSOLE is not set -# CONFIG_GEODELX_VIDEO_CONSOLE is not set -CONFIG_COREBOOT_VIDEO_CONSOLE=y -CONFIG_PC_KEYBOARD=y -CONFIG_PC_KEYBOARD_LAYOUT_US=y -# CONFIG_PC_KEYBOARD_LAYOUT_DE is not set +CONFIG_LP_SKIP_CONSOLE_INIT=y +CONFIG_LP_CBMEM_CONSOLE=y +CONFIG_LP_SERIAL_CONSOLE=y +CONFIG_LP_8250_SERIAL_CONSOLE=y +CONFIG_LP_SERIAL_IOBASE=0x3f8 +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set +CONFIG_LP_VIDEO_CONSOLE=y +# CONFIG_LP_VGA_VIDEO_CONSOLE is not set +# CONFIG_LP_GEODELX_VIDEO_CONSOLE is not set +CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y +CONFIG_LP_PC_KEYBOARD=y +CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y +# CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set # # Drivers # -CONFIG_PCI=y -CONFIG_NVRAM=y -# CONFIG_RTC_PORT_EXTENDED_VIA is not set -# CONFIG_SPEAKER is not set -# CONFIG_STORAGE is not set -CONFIG_USB=y -# CONFIG_USB_UHCI is not set -# CONFIG_USB_OHCI is not set -# CONFIG_USB_EHCI is not set -CONFIG_USB_XHCI=y -CONFIG_USB_HID=y -CONFIG_USB_HUB=y -CONFIG_USB_MSC=y -CONFIG_USB_PCI=y -# CONFIG_USB_MEMORY is not set -# CONFIG_BIG_ENDIAN is not set -CONFIG_LITTLE_ENDIAN=y -CONFIG_IO_ADDRESS_SPACE=y -CONFIG_ARCH_SPECIFIC_OPTIONS=y +CONFIG_LP_PCI=y +CONFIG_LP_NVRAM=y +# CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set +# CONFIG_LP_SPEAKER is not set +# CONFIG_LP_STORAGE is not set +CONFIG_LP_USB=y +# CONFIG_LP_USB_UHCI is not set +# CONFIG_LP_USB_OHCI is not set +# CONFIG_LP_USB_EHCI is not set +CONFIG_LP_USB_XHCI=y +CONFIG_LP_USB_HID=y +CONFIG_LP_USB_HUB=y +CONFIG_LP_USB_MSC=y +CONFIG_LP_USB_PCI=y +# CONFIG_LP_USB_MEMORY is not set +# CONFIG_LP_BIG_ENDIAN is not set +CONFIG_LP_LITTLE_ENDIAN=y +CONFIG_LP_IO_ADDRESS_SPACE=y +CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y |