Fix building for mx51evk board

PATCH New Anatolij Gustschin 2 participants 2 messages Dec 12, 2011 – Dec 13, 2011

Share & tools

Anatolij Gustschin

author

2011-12-12 11:25 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 board/freescale/mx51evk/mx51evk.c   |    3 ++-
 board/freescale/mx53loco/mx53loco.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

board/freescale/mx51evk/mx51evk.c +2 -1

index 13c5941..e43aaf7 100644
@@ -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

board/freescale/mx53loco/mx53loco.c +2 -1

index 57170ce..ea4d354 100644
@@ -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

Signature · 1 line

1.7.1

Stefano Babic

2011-12-13 17:40 UTC #1 lore raw

PATCH 1/1 Fix building for mx51evk board

Quoted 10 lines · Anatolij Gustschin

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 <[email protected]>

Applied to u-boot-imx (fix), thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================