| Message ID | 50b879fd.0652b40a.733e.74b9@mx.google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andreas Bießmann |
| Headers | show |
On 11/30/2012 17:18, richard.genoud@gmail.com wrote: > From: Richard Genoud <richard.genoud@gmail.com> > > Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Bo Shen <voice.shen@atmel.com Best Regards, Bo Shen > --- > include/configs/at91sam9x5ek.h | 23 +++++++++++++++++++++++ > 1 files changed, 23 insertions(+), 0 deletions(-) > > diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h > index 5e5f9c1..915714f 100644 > --- a/include/configs/at91sam9x5ek.h > +++ b/include/configs/at91sam9x5ek.h > @@ -91,6 +91,13 @@ > #define CONFIG_CMD_SF > #define CONFIG_CMD_MMC > #define CONFIG_CMD_FAT > +#define CONFIG_CMD_USB > + > +/* > + * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0) > + * NB: in this case, USB 1.1 devices won't be recognized. > + */ > + > > /* SDRAM */ > #define CONFIG_NR_DRAM_BANKS 1 > @@ -158,6 +165,22 @@ > #define CONFIG_NET_RETRY_COUNT 20 > #define CONFIG_MACB_SEARCH_PHY > > +/* USB */ > +#ifdef CONFIG_CMD_USB > +#ifdef CONFIG_USB_EHCI > +#define CONFIG_USB_EHCI_ATMEL > +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 > +#else > +#define CONFIG_USB_OHCI_NEW > +#define CONFIG_SYS_USB_OHCI_CPU_INIT > +#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI > +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9x5" > +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 > +#endif > +#define CONFIG_USB_ATMEL > +#define CONFIG_USB_STORAGE > +#endif > + > #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ > > #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE >
Dear richard.genoud@gmail.com, On 30.11.2012 10:18, richard.genoud@gmail.com wrote: > From: Richard Genoud <richard.genoud@gmail.com> > > Signed-off-by: Richard Genoud <richard.genoud@gmail.com> > --- > include/configs/at91sam9x5ek.h | 23 +++++++++++++++++++++++ > 1 files changed, 23 insertions(+), 0 deletions(-) applied to u-boot-atmel/master, thanks! Best regards Andreas Bießmann
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 5e5f9c1..915714f 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -91,6 +91,13 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT +#define CONFIG_CMD_USB + +/* + * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0) + * NB: in this case, USB 1.1 devices won't be recognized. + */ + /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -158,6 +165,22 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY +/* USB */ +#ifdef CONFIG_CMD_USB +#ifdef CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_ATMEL +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 +#else +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_CPU_INIT +#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9x5" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 +#endif +#define CONFIG_USB_ATMEL +#define CONFIG_USB_STORAGE +#endif + #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE