diff options
| author | Anatolij Gustschin <agust@denx.de> | 2011-12-12 01:25:46 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-12-19 17:52:43 +0100 |
| commit | 60bae5ef826b4685ccf433dae4ac2d3fea5b4839 (patch) | |
| tree | 130f15e0f87bb433d13b5a1f6d67b7b26a4af7ee | |
| parent | 901de79a3792c81aefcbf207a34049e63f21362b (diff) | |
| download | blackbird-obmc-uboot-60bae5ef826b4685ccf433dae4ac2d3fea5b4839.tar.gz blackbird-obmc-uboot-60bae5ef826b4685ccf433dae4ac2d3fea5b4839.zip | |
Fix building for mx51evk board
Fix:
mx51evk.c:206:6: error: conflicting types for 'board_ehci_hcd_init'
/u-boot/include/usb/ehci-fsl.h:254:5: note: previous declaration of
'board_ehci_hcd_init' was here
We also fix board_ehci_hcd_init() for mx53loco board.
Building for mx53loco worked since <usb/ehci-fsl.h> is
not included here.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | board/freescale/mx51evk/mx51evk.c | 3 | ||||
| -rw-r--r-- | board/freescale/mx53loco/mx53loco.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 13c59413ec..e43aaf726e 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -203,7 +203,7 @@ static void setup_usb_h1(void) mxc_iomux_set_pad(MX51_PIN_EIM_D21, GPIO_PAD); } -void board_ehci_hcd_init(int port) +int board_ehci_hcd_init(int port) { /* Set USBH1_STP to GPIO and toggle it */ mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_GPIO); @@ -228,6 +228,7 @@ void board_ehci_hcd_init(int port) gpio_direction_output(MX51EVK_USBH1_HUB_RST, 0); mdelay(2); gpio_set_value(MX51EVK_USBH1_HUB_RST, 1); + return 0; } #endif diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 57170ce045..ea4d354311 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -79,12 +79,13 @@ static void setup_iomux_uart(void) } #ifdef CONFIG_USB_EHCI_MX5 -void board_ehci_hcd_init(int port) +int board_ehci_hcd_init(int port) { /* request VBUS power enable pin, GPIO[8}, gpio7 */ mxc_request_iomux(MX53_PIN_ATA_DA_2, IOMUX_CONFIG_ALT1); gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), 0); gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), 1); + return 0; } #endif |
