diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2016-03-12 11:51:18 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2016-03-15 18:22:44 +0100 |
| commit | 96d14ac1c9b81cf1347c3f2c66f847d6d4527b8e (patch) | |
| tree | 83ac9657b1310a6510797f393d5a8e5757fd174a | |
| parent | 24ae84d2604e0352081a705ab5c074cefdbdd2ec (diff) | |
libpayload: Unify defconfigs
Bring defconfig and defconfig-tinycurses in sync, so that
defconfig and defconfig-tinycurses only differ in the selection
of the curses implementation.
Change-Id: I739c5122b5aaaa2681055c845905721a0b2a11c1
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/14069
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | payloads/libpayload/configs/defconfig | 1 | ||||
| -rw-r--r-- | payloads/libpayload/configs/defconfig-tinycurses | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 37bf50d5ad..1d516f7709 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -32,6 +32,7 @@ CONFIG_LP_CURSES=y CONFIG_LP_PDCURSES=y CONFIG_LP_CBFS=y CONFIG_LP_LZMA=y +CONFIG_LP_LZ4=y # # Console Options diff --git a/payloads/libpayload/configs/defconfig-tinycurses b/payloads/libpayload/configs/defconfig-tinycurses index f87690351c..7e74fb29ac 100644 --- a/payloads/libpayload/configs/defconfig-tinycurses +++ b/payloads/libpayload/configs/defconfig-tinycurses @@ -21,7 +21,7 @@ CONFIG_LP_ARCH_X86=y # CONFIG_LP_ARCH_ARM64 is not set # CONFIG_LP_ARCH_MIPS is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set -CONFIG_LP_MULTIBOOT=y +# CONFIG_LP_MULTIBOOT is not set # # Standard Libraries @@ -52,7 +52,7 @@ CONFIG_LP_SERIAL_IOBASE=0x3f8 CONFIG_LP_VIDEO_CONSOLE=y CONFIG_LP_VGA_VIDEO_CONSOLE=y # CONFIG_LP_GEODELX_VIDEO_CONSOLE is not set -# CONFIG_LP_COREBOOT_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 @@ -71,8 +71,18 @@ CONFIG_LP_STORAGE_ATAPI=y CONFIG_LP_STORAGE_AHCI=y CONFIG_LP_STORAGE_AHCI_ONLY_TESTED=y CONFIG_LP_TIMER_RDTSC=y -# CONFIG_LP_USB is not set -# CONFIG_LP_USB_GEN_HUB is not set +CONFIG_LP_USB=y +CONFIG_LP_USB_UHCI=y +CONFIG_LP_USB_OHCI=y +CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_XHCI=y +# CONFIG_LP_USB_XHCI_MTK_QUIRK is not set +CONFIG_LP_USB_HID=y +CONFIG_LP_USB_HUB=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set +CONFIG_LP_USB_MSC=y +CONFIG_LP_USB_GEN_HUB=y +CONFIG_LP_USB_PCI=y # CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y |