From 775476f88dd52b7a755c7cd3916cd8387d2e893f Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 3 Jul 2013 11:37:33 -0500 Subject: [PATCH] wtm2: fix build breakage and misconfiguration In some header shuffling stdint.h no longer included a definition for NULL. Pull in string.h for the proper definition. Also, disable the xHCI controller in libpayload as the firmware leaves control of the USB 3.0 ports to the EHCI controller. BUG=None BRANCH=None TEST=Was able to boot in in non-dev mode. In dev mode there were no longer errors about the xHCI controller. Change-Id: Iabf15b3b17d88784e0718dc9f0fd885e6551e0b1 Signed-off-by: Aaron Durbin Reviewed-on: https://gerrit.chromium.org/gerrit/60874 Reviewed-by: Sameer Nanda --- payloads/libpayload/configs/config.fox_wtm2 | 15 +++++++++------ src/mainboard/intel/wtm2/romstage.c | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/payloads/libpayload/configs/config.fox_wtm2 b/payloads/libpayload/configs/config.fox_wtm2 index a5d60875d6..b12c1a429b 100644 --- a/payloads/libpayload/configs/config.fox_wtm2 +++ b/payloads/libpayload/configs/config.fox_wtm2 @@ -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 @@ -60,9 +59,13 @@ CONFIG_USB=y CONFIG_USB_UHCI=y CONFIG_USB_OHCI=y 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=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/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c index fee02728ff..3746dbbdd8 100644 --- a/src/mainboard/intel/wtm2/romstage.c +++ b/src/mainboard/intel/wtm2/romstage.c @@ -19,6 +19,7 @@ */ #include +#include #include #include "cpu/intel/haswell/haswell.h" #include "northbridge/intel/haswell/haswell.h"