[coreboot-gerrit] New patch to review for coreboot: 4a1207f libpayload: Clean up USB build warnings
Marc Jones (marc.jones@se-eng.com)
gerrit at coreboot.org
Tue Dec 23 23:26:06 CET 2014
Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7921
-gerrit
commit 4a1207f53539797ad002e005dc15c9d6cf514b62
Author: Marc Jones <marc.jones at se-eng.com>
Date: Tue Dec 23 15:11:07 2014 -0700
libpayload: Clean up USB build warnings
There were a few build warnings in the USB driver to clean up
before -Werror may be enabled.
Change-Id: I220cfcf0ee926912a184a91d3ced3ba61259130e
Signed-off-by: Marc Jones <marc.jones at se-eng.com>
---
3rdparty | 2 +-
payloads/libpayload/drivers/usb/usbinit.c | 6 +++---
payloads/libpayload/drivers/usb/xhci.c | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/3rdparty b/3rdparty
index a8b0c52..9f68e20 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit a8b0c52850495c30dfa1cd8cc2c679a6ba4e18ac
+Subproject commit 9f68e20e5ef4b6681fb18bdb4022471bc6810788
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c
index 1710760..6fb7d4b 100644
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -172,15 +172,15 @@ hci_t *usb_add_mmio_hc(hc_type type, void *bar)
switch (type) {
#ifdef CONFIG_LP_USB_OHCI
case OHCI:
- return ohci_init(bar);
+ return ohci_init((unsigned long)bar);
#endif
#ifdef CONFIG_LP_USB_EHCI
case EHCI:
- return ehci_init(bar);
+ return ehci_init((unsigned long)bar);
#endif
#ifdef CONFIG_LP_USB_XHCI
case XHCI:
- return xhci_init(bar);
+ return xhci_init((unsigned long)bar);
#endif
default:
usb_debug("HC type %d (at %p) is not supported!\n", type, bar);
diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index 9807858..7c6e219 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -88,6 +88,7 @@ xhci_init_cycle_ring(transfer_ring_t *const tr, const size_t ring_size)
}
/* On Panther Point: switch ports shared with EHCI to xHCI */
+#ifdef CONFIG_LP_USB_PCI
static void
xhci_switch_ppt_ports(pcidev_t addr)
{
@@ -109,6 +110,7 @@ xhci_switch_ppt_ports(pcidev_t addr)
xhci_debug("Actually switched over: 0x%"PRIx32"\n", reg32);
}
}
+#endif
/* On Panther Point: switch all ports back to EHCI */
static void
@@ -286,7 +288,7 @@ _free_xhci:
free(xhci->roothub);
free(xhci->dev);
free(xhci);
-_free_controller:
+/* _free_controller: */
detach_controller(controller);
free(controller);
return NULL;
More information about the coreboot-gerrit
mailing list