diff options
author | Tom Rini <trini@ti.com> | 2013-08-27 09:49:43 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-08-27 09:49:43 -0400 |
commit | 529c0d9b8cdfae232e4ed082fd8cde5416b266b7 (patch) | |
tree | ea7b948c6faafb4ad9d754eca568a2ae2a0100fc /include | |
parent | 880a41273265233004516351189aad126f964c86 (diff) | |
parent | c95e2b9eaeadc0f985030ffa0638278acc2d8727 (diff) | |
download | u-boot-imx-529c0d9b8cdfae232e4ed082fd8cde5416b266b7.zip u-boot-imx-529c0d9b8cdfae232e4ed082fd8cde5416b266b7.tar.gz u-boot-imx-529c0d9b8cdfae232e4ed082fd8cde5416b266b7.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/omap5_uevm.h | 24 | ||||
-rw-r--r-- | include/dfu.h | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index d10c2b5..0bba84b 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -40,6 +40,30 @@ #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 +/* USB UHH support options */ +#define CONFIG_CMD_USB +#define CONFIG_USB_HOST +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_OMAP +#define CONFIG_USB_STORAGE +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET + +#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80 +#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79 + +/* Enabled commands */ +#define CONFIG_NET_MULTI +#define CONFIG_CMD_DHCP /* DHCP Support */ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NFS /* NFS support */ + +/* USB Networking options */ +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX + +#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # " + #define CONSOLEDEV "ttyO2" #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 diff --git a/include/dfu.h b/include/dfu.h index 1d4006d..47b9055 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -47,6 +47,8 @@ struct nand_internal_data { unsigned int dev; unsigned int part; + /* for nand/ubi use */ + unsigned int ubi; }; static inline unsigned int get_mmc_blk_size(int dev) |