On 29.11.2012 15:27, Marek Vasut wrote:

Dear Lukasz Dalek,

...

usbdescriptors.h conflicts with linux/usb/ch9.h. Remove it.

Applied, thanks

...

Signed-off-by: Lukasz Dalekluk0104@gmail.com

drivers/usb/gadget/pxa25x_udc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index dd74143..9ce98f0 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -40,7 +40,6 @@ #include<asm/io.h> #include<asm/arch/pxa.h>

-#include<usbdescriptors.h> #include<linux/usb/ch9.h> #include<linux/usb/gadget.h> #include<usb/lin_gadget_compat.h>

Best regards, Marek Vasut

One more question. I've send you before patch which enables support for USB in h2200 device, which you accepted but didn't push. Did you find more problem out there or just forgot to apply?

Łukasz Dałek

Add support for ethernet over USB which can be used for e.g. booting process. It works with tftp and dhcp clients code.

Signed-off-by: Lukasz Dalek luk0104@gmail.com --- Changes for v7: - Removed CONFIG_H2200_USBETH Changes for v6: - Defined only one entire for board Changes for v5: - Surrendered #include <usb.h> with CONFIGs --- board/h2200/h2200.c | 11 +++++++++++ include/configs/h2200.h | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/board/h2200/h2200.c b/board/h2200/h2200.c index 3076306..720b06e 100644 --- a/board/h2200/h2200.c +++ b/board/h2200/h2200.c @@ -22,9 +22,16 @@ #include <asm/arch/pxa.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> +#include <usb.h>

DECLARE_GLOBAL_DATA_PTR;

+int board_eth_init(bd_t *bis) +{ + usb_eth_initialize(bis); + return 0; +} + int board_init(void) { /* We have RAM, disable cache */ @@ -36,6 +43,10 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = 0xa0000100;

+ /* Let host see that device is disconnected */ + udc_disconnect(); + mdelay(500); + return 0; }

diff --git a/include/configs/h2200.h b/include/configs/h2200.h index ef14dd3..516a26e 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -154,4 +154,29 @@

#define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"

+#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_USB_DEV_PULLUP_GPIO 33 +/* USB VBUS GPIO 3 */ + +#define CONFIG_CMD_NET +#define CONFIG_CMD_PING + +#define CONFIG_BOOTDELAY 2 +#define CONFIG_BOOTCOMMAND \ + "setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \ + "if bootp ; then setenv downloaded 1 ; fi ; done ; " \ + "source :script ; " \ + "bootm ; " + +#define CONFIG_USB_GADGET_PXA2XX +#define CONFIG_USB_ETHER +#define CONFIG_USB_ETH_SUBSET + +#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01" +#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" + #endif /* __CONFIG_H */