| Message ID | 1356971563-23478-4-git-send-email-ilya.yanok@cogentembedded.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 12/31/12 11:32, Ilya Yanok wrote: > This adds necessary config options to enable usb booting and fixes > board_eth_init() function to take into account that we may have USB > ether support in SPL now. [snip] > +#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" +#define > CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" #endif /* > CONFIG_MUSB_GADGET */ We need to re-work this, ala the vendor tree, to use the same MAC as the cpsw ethernet device uses, to match the ROM behavior. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQ5E1IAAoJENk4IS6UOR1WWd4P/R5LN98R0TFyRaynMgaUMUHp yxl8HclxesZ521AXKQ+laazCbwA+5n+yOr9UIkdNj7Cw9VJ+nh5PacecXhKO6Jdc TOGsSzy/yQAofmPjqndKoys1ICNlBo9xUYTG2j4AedJaa4ogYEICJxyrq77dGEMw d+PktUKf2BCp6ui3vERiLUycoqdf/GU6fcTftodX97B+MNO/JBGTIPXzw5zsYljQ SSR2he7JM6CN0YBNqbO8cssdDSd65VMi5rFy7viZWsd6qYhHaKI10lvdLNVryPRl aCPNj8qOCYvswKHk028OQuiUQEOUIw2fRqEXNGfJbhYkk8ePaTsrdiwOHUWMjMlW gF5Two5eX8SUobkirqwGYt3V5uGuumS3ZLPw4lAuZpmLBbzmlLvPw4EooOT1CSoS AW/Je0dQ87PqOcQkcci97V5Cp2Hef1VLMAh7cAYA+AUQ6nNDwqU7dwZUjFTeDZQB 2MHOURgcOKRyMmni21M1GyLWwfTrv7Q47PIqEl31cmFW05xVoQ06Km8TwsCK8L66 a0H99UuSO1gTsOHRAogUKDdH3gebwtQkDaMTUzH/4FTJWnvMNvGPuzM8Q7BdmAYg V/heDO7yR0LJtfNiBiC3KxbVmw980Un5TZAXpH2CFNc1+3DyW3MYyXGhsHNnd4hn fLdgBqd1xQj+B1osy6Ol =FtLs -----END PGP SIGNATURE-----
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index f0eca54..5728c9a 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -425,7 +425,8 @@ int board_eth_init(bd_t *bis) n += rv; #endif try_usbether: -#if defined(CONFIG_USB_ETHER) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_USB_ETHER) && \ + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) rv = usb_eth_initialize(bis); if (rv < 0) printf("Error %d registering USB_ETHER\n", rv); diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ab9549b..2da863d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -238,6 +238,8 @@ #define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 +#define CONFIG_SPL_MUSB_NEW_SUPPORT +#define CONFIG_SPL_USBETH_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" /* @@ -279,6 +281,8 @@ #ifdef CONFIG_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS +#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" +#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" #endif /* CONFIG_MUSB_GADGET */ /* Unsupported features */ @@ -301,4 +305,8 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC +#ifdef CONFIG_SPL_BUILD +/* disable host part of MUSB in SPL */ +#undef CONFIG_MUSB_HOST +#endif #endif /* ! __CONFIG_AM335X_EVM_H */
This adds necessary config options to enable usb booting and fixes board_eth_init() function to take into account that we may have USB ether support in SPL now. Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com> --- board/ti/am335x/board.c | 3 ++- include/configs/am335x_evm.h | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)