[coreboot-gerrit] New patch to review for coreboot: libpayload: Unify defconfigs

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14069

-gerrit

commit 4f60d666f0d92000bd70ab7213d7c9a5f9a20732
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Sat Mar 12 11:51:18 2016 -0800

    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 at coreboot.org>
---
 payloads/libpayload/configs/defconfig            |  1 +
 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 37bf50d..1d516f7 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 f876903..7e74fb2 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