libpayload not building drivers/usb/xhci.c

[Dave Frodin]

I'm seeing a problem building payloads. The problem is actually occuring
when libpayload gets built prior
to being copied down to the payload. I'm building a different payload, but
the problem can be seen
when building coreinfo. Here's the sequence I used

cd payloads/coreinfo
make distclean
rm -rf libpayloadbin
make

These are the errors I see...

drivers/usb/xhci.c:146:1: error: conflicting types for ‘xhci_init’
In file included from drivers/usb/xhci.c:36:0:
drivers/usb/xhci.h:37:8: note: previous declaration of ‘xhci_init’ was here
drivers/usb/xhci.c: In function ‘xhci_pci_init’:
drivers/usb/xhci.c:314:13: error: incompatible types when assigning to type
‘hci_t’ from type ‘struct hci_t *’
drivers/usb/xhci.c:315:12: error: invalid type argument of ‘->’ (have
‘hci_t’)
drivers/usb/xhci.c:319:2: error: incompatible types when returning type
‘hci_t’ but ‘struct hci_t *’ was expected
drivers/usb/xhci.c: In function ‘xhci_shutdown’:
drivers/usb/xhci.c:417:38: error: ‘hci_t’ has no member named ‘bus_address’
drivers/usb/xhci.c: In function ‘xhci_pci_init’:
drivers/usb/xhci.c:320:1: warning: control reaches end of non-void function
[-Wreturn-type]

I bisected the problem down to this commit

commit 8992e53c23cb088efbdafbf3e2ba77e7d8778d71
Author: Stefan Reinauer 
Date:   Thu May 2 16:16:41 2013 -0700

libpayload: Add USB support for non-PCI controllers

Thanks,
Dave