diff options
| author | Tom Rini <trini@ti.com> | 2015-01-26 06:42:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-26 06:42:40 -0500 |
| commit | aed03faa064cca56847571b13cbd4c849c6116aa (patch) | |
| tree | cb136b3bd51851e1fd107c16a5744c8a775df29f /board/atmel | |
| parent | 306df2c8241bd363c71a99841630fb5e85d81fae (diff) | |
| parent | 52305a829cd927aca2eb4a15985c567e98f562b9 (diff) | |
| download | talos-obmc-uboot-aed03faa064cca56847571b13cbd4c849c6116aa.tar.gz talos-obmc-uboot-aed03faa064cca56847571b13cbd4c849c6116aa.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'board/atmel')
| -rw-r--r-- | board/atmel/sama5d4_xplained/sama5d4_xplained.c | 11 | ||||
| -rw-r--r-- | board/atmel/sama5d4ek/sama5d4ek.c | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 2758c5cbcd..1c5b92c8b5 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -10,6 +10,7 @@ #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> +#include <asm/arch/atmel_usba_udc.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/sama5d3_smc.h> @@ -294,6 +295,9 @@ int board_init(void) #ifdef CONFIG_CMD_USB sama5d4_xplained_usb_hw_init(); #endif +#ifdef CONFIG_USB_GADGET_ATMEL_USBA + at91_udp_hw_init(); +#endif return 0; } @@ -313,5 +317,12 @@ int board_eth_init(bd_t *bis) rc = macb_eth_initialize(0, (void *)ATMEL_BASE_GMAC0, 0x00); #endif +#ifdef CONFIG_USB_GADGET_ATMEL_USBA + usba_udc_probe(&pdata); +#ifdef CONFIG_USB_ETH_RNDIS + usb_eth_initialize(bis); +#endif +#endif + return rc; } diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index d3039c021a..d8ff648957 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -10,6 +10,7 @@ #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> +#include <asm/arch/atmel_usba_udc.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/sama5d3_smc.h> @@ -293,6 +294,9 @@ int board_init(void) #ifdef CONFIG_CMD_USB sama5d4ek_usb_hw_init(); #endif +#ifdef CONFIG_USB_GADGET_ATMEL_USBA + at91_udp_hw_init(); +#endif return 0; } @@ -312,5 +316,12 @@ int board_eth_init(bd_t *bis) rc = macb_eth_initialize(0, (void *)ATMEL_BASE_GMAC0, 0x00); #endif +#ifdef CONFIG_USB_GADGET_ATMEL_USBA + usba_udc_probe(&pdata); +#ifdef CONFIG_USB_ETH_RNDIS + usb_eth_initialize(bis); +#endif +#endif + return rc; } |
