diff options
| author | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
| commit | 748bde608a8dfea5b64e186af4d9c27642fe7813 (patch) | |
| tree | 8564b610e812404bd320ddea458fc585d9c49d7e /board/esd | |
| parent | 9dff87a297dabe4af60012ad2d990ff8967f1d55 (diff) | |
| parent | 449697f14ebc9f7cb5bf15bbad0d46c6ca2c4979 (diff) | |
| download | blackbird-obmc-uboot-748bde608a8dfea5b64e186af4d9c27642fe7813.tar.gz blackbird-obmc-uboot-748bde608a8dfea5b64e186af4d9c27642fe7813.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/esd')
| -rw-r--r-- | board/esd/apc405/apc405.c | 8 | ||||
| -rw-r--r-- | board/esd/pmc440/pmc440.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index f13f088d55..5cc1d0d9d6 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -17,6 +17,7 @@ #include <mtd/cfi_flash.h> #include <asm/4xx_pci.h> #include <pci.h> +#include <usb.h> DECLARE_GLOBAL_DATA_PTR; @@ -428,7 +429,7 @@ void reset_phy(void) } #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) -int usb_board_init(void) +int board_usb_init(int index, enum usb_init_type init) { return 0; } @@ -453,9 +454,8 @@ int usb_board_stop(void) return 0; } -int usb_board_init_fail(void) +int board_usb_cleanup(int index, enum usb_init_type init) { - usb_board_stop(); - return 0; + return usb_board_stop(); } #endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) */ diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index 549b3b73ce..88fc5f77b6 100644 --- a/board/esd/pmc440/pmc440.c +++ b/board/esd/pmc440/pmc440.c @@ -27,6 +27,7 @@ #endif #include <serial.h> #include <asm/4xx_pci.h> +#include <usb.h> #include "fpga.h" #include "pmc440.h" @@ -821,7 +822,7 @@ int bootstrap_eeprom_read (unsigned dev_addr, unsigned offset, } #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) -int usb_board_init(void) +int board_usb_init(int index, enum usb_init_type init) { char *act = getenv("usbact"); int i; @@ -845,10 +846,9 @@ int usb_board_stop(void) return 0; } -int usb_board_init_fail(void) +int board_usb_cleanup(int index, enum usb_init_type init) { - usb_board_stop(); - return 0; + return usb_board_stop(); } #endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) */ |
