From 8a7e1b4900adcb9b3dfcfa4c0e2859c0df3a867a Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 2 May 2013 16:19:17 -0700 Subject: [PATCH] libpayload: Update ChromeOS config files BUG=chrome-os-partner:18635 TEST=Boot from USB in depthcharge on Snow Change-Id: I472fbb9df22e4e1271d6c3a743744d4ee8a4f659 Signed-off-by: Stefan Reinauer Reviewed-on: https://gerrit.chromium.org/gerrit/49971 --- payloads/libpayload/configs/config.daisy | 29 +++++++------------ .../configs/config.fox_baskingridge | 13 +++++---- payloads/libpayload/configs/config.link | 13 +++++---- payloads/libpayload/configs/config.lumpy | 13 +++++---- payloads/libpayload/configs/config.peach_pit | 29 +++++++------------ payloads/libpayload/configs/config.slippy | 13 +++++---- payloads/libpayload/configs/defconfig | 6 +++- 7 files changed, 59 insertions(+), 57 deletions(-) diff --git a/payloads/libpayload/configs/config.daisy b/payloads/libpayload/configs/config.daisy index fccfee8f41..0d0cc0a826 100644 --- a/payloads/libpayload/configs/config.daisy +++ b/payloads/libpayload/configs/config.daisy @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Fri May 3 13:22:35 2013 # # @@ -15,19 +15,16 @@ CONFIG_CHROMEOS=y # # Architecture Options # -# CONFIG_ARCH_X86 is not set -# CONFIG_ARCH_POWERPC is not set CONFIG_ARCH_ARMV7=y +# CONFIG_ARCH_POWERPC is not set +# CONFIG_ARCH_X86 is not set # CONFIG_MEMMAP_RAM_ONLY is not set -# CONFIG_MULTIBOOT is not set # # Standard Libraries # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,31 +34,27 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y # CONFIG_SERIAL_CONSOLE is not set -# 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 is not set -# CONFIG_PC_KEYBOARD_LAYOUT_US is not set -# CONFIG_PC_KEYBOARD_LAYOUT_DE is not set # # Drivers # -# CONFIG_PCI is not set -# CONFIG_NVRAM is not set # 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=y +# CONFIG_USB_OHCI is not set CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y +# CONFIG_USB_XHCI is not set CONFIG_USB_HID=y CONFIG_USB_HUB=y CONFIG_USB_MSC=y +# CONFIG_USB_PCI is not set +CONFIG_USB_MEMORY=y +CONFIG_USB_OHCI_BASE_ADDRESS=0x12120000 +CONFIG_USB_EHCI_BASE_ADDRESS=0x12110000 +# CONFIG_BIG_ENDIAN is not set CONFIG_LITTLE_ENDIAN=y +# CONFIG_IO_ADDRESS_SPACE is not set CONFIG_ARCH_SPECIFIC_OPTIONS=y diff --git a/payloads/libpayload/configs/config.fox_baskingridge b/payloads/libpayload/configs/config.fox_baskingridge index a5d60875d6..87f5ad55a5 100644 --- a/payloads/libpayload/configs/config.fox_baskingridge +++ b/payloads/libpayload/configs/config.fox_baskingridge @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Thu May 2 16:10:03 2013 # # @@ -15,9 +15,9 @@ CONFIG_CHROMEOS=y # # Architecture Options # -CONFIG_ARCH_X86=y -# CONFIG_ARCH_POWERPC is not set # 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 @@ -26,8 +26,6 @@ CONFIG_ARCH_X86=y # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,6 +35,7 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y CONFIG_SERIAL_CONSOLE=y +CONFIG_X86_SERIAL_CONSOLE=y CONFIG_SERIAL_IOBASE=0x3f8 # CONFIG_SERIAL_SET_SPEED is not set # CONFIG_SERIAL_ACS_FALLBACK is not set @@ -64,5 +63,9 @@ 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 diff --git a/payloads/libpayload/configs/config.link b/payloads/libpayload/configs/config.link index a5d60875d6..87f5ad55a5 100644 --- a/payloads/libpayload/configs/config.link +++ b/payloads/libpayload/configs/config.link @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Thu May 2 16:10:03 2013 # # @@ -15,9 +15,9 @@ CONFIG_CHROMEOS=y # # Architecture Options # -CONFIG_ARCH_X86=y -# CONFIG_ARCH_POWERPC is not set # 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 @@ -26,8 +26,6 @@ CONFIG_ARCH_X86=y # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,6 +35,7 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y CONFIG_SERIAL_CONSOLE=y +CONFIG_X86_SERIAL_CONSOLE=y CONFIG_SERIAL_IOBASE=0x3f8 # CONFIG_SERIAL_SET_SPEED is not set # CONFIG_SERIAL_ACS_FALLBACK is not set @@ -64,5 +63,9 @@ 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 diff --git a/payloads/libpayload/configs/config.lumpy b/payloads/libpayload/configs/config.lumpy index a5d60875d6..87f5ad55a5 100644 --- a/payloads/libpayload/configs/config.lumpy +++ b/payloads/libpayload/configs/config.lumpy @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Thu May 2 16:10:03 2013 # # @@ -15,9 +15,9 @@ CONFIG_CHROMEOS=y # # Architecture Options # -CONFIG_ARCH_X86=y -# CONFIG_ARCH_POWERPC is not set # 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 @@ -26,8 +26,6 @@ CONFIG_ARCH_X86=y # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,6 +35,7 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y CONFIG_SERIAL_CONSOLE=y +CONFIG_X86_SERIAL_CONSOLE=y CONFIG_SERIAL_IOBASE=0x3f8 # CONFIG_SERIAL_SET_SPEED is not set # CONFIG_SERIAL_ACS_FALLBACK is not set @@ -64,5 +63,9 @@ 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 diff --git a/payloads/libpayload/configs/config.peach_pit b/payloads/libpayload/configs/config.peach_pit index fccfee8f41..0d0cc0a826 100644 --- a/payloads/libpayload/configs/config.peach_pit +++ b/payloads/libpayload/configs/config.peach_pit @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Fri May 3 13:22:35 2013 # # @@ -15,19 +15,16 @@ CONFIG_CHROMEOS=y # # Architecture Options # -# CONFIG_ARCH_X86 is not set -# CONFIG_ARCH_POWERPC is not set CONFIG_ARCH_ARMV7=y +# CONFIG_ARCH_POWERPC is not set +# CONFIG_ARCH_X86 is not set # CONFIG_MEMMAP_RAM_ONLY is not set -# CONFIG_MULTIBOOT is not set # # Standard Libraries # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,31 +34,27 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y # CONFIG_SERIAL_CONSOLE is not set -# 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 is not set -# CONFIG_PC_KEYBOARD_LAYOUT_US is not set -# CONFIG_PC_KEYBOARD_LAYOUT_DE is not set # # Drivers # -# CONFIG_PCI is not set -# CONFIG_NVRAM is not set # 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=y +# CONFIG_USB_OHCI is not set CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y +# CONFIG_USB_XHCI is not set CONFIG_USB_HID=y CONFIG_USB_HUB=y CONFIG_USB_MSC=y +# CONFIG_USB_PCI is not set +CONFIG_USB_MEMORY=y +CONFIG_USB_OHCI_BASE_ADDRESS=0x12120000 +CONFIG_USB_EHCI_BASE_ADDRESS=0x12110000 +# CONFIG_BIG_ENDIAN is not set CONFIG_LITTLE_ENDIAN=y +# CONFIG_IO_ADDRESS_SPACE is not set CONFIG_ARCH_SPECIFIC_OPTIONS=y diff --git a/payloads/libpayload/configs/config.slippy b/payloads/libpayload/configs/config.slippy index a5d60875d6..87f5ad55a5 100644 --- a/payloads/libpayload/configs/config.slippy +++ b/payloads/libpayload/configs/config.slippy @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Tue Sep 4 17:53:34 2012 +# Thu May 2 16:10:03 2013 # # @@ -15,9 +15,9 @@ CONFIG_CHROMEOS=y # # Architecture Options # -CONFIG_ARCH_X86=y -# CONFIG_ARCH_POWERPC is not set # 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 @@ -26,8 +26,6 @@ CONFIG_ARCH_X86=y # CONFIG_LIBC=y # CONFIG_CURSES is not set -# CONFIG_TINYCURSES is not set -# CONFIG_PDCURSES is not set CONFIG_CBFS=y CONFIG_LZMA=y @@ -37,6 +35,7 @@ CONFIG_LZMA=y CONFIG_SKIP_CONSOLE_INIT=y CONFIG_CBMEM_CONSOLE=y CONFIG_SERIAL_CONSOLE=y +CONFIG_X86_SERIAL_CONSOLE=y CONFIG_SERIAL_IOBASE=0x3f8 # CONFIG_SERIAL_SET_SPEED is not set # CONFIG_SERIAL_ACS_FALLBACK is not set @@ -64,5 +63,9 @@ 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 diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index 2a2e90b42d..05e47f501b 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # libpayload version: 0.2.0 -# Mon Dec 17 14:39:45 2012 +# Thu May 2 16:10:03 2013 # # @@ -37,6 +37,7 @@ CONFIG_LZMA=y # CONFIG_SKIP_CONSOLE_INIT is not set CONFIG_CBMEM_CONSOLE=y CONFIG_SERIAL_CONSOLE=y +CONFIG_X86_SERIAL_CONSOLE=y CONFIG_SERIAL_IOBASE=0x3f8 # CONFIG_SERIAL_SET_SPEED is not set # CONFIG_SERIAL_ACS_FALLBACK is not set @@ -69,6 +70,9 @@ 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