Merge branch 'master' of git://git.denx.de/u-boot-usb
This commit is contained in:
@@ -82,6 +82,16 @@
|
||||
#define CONFIG_MMC_SDHCI_IO_ACCESSORS
|
||||
#define CONFIG_BCM2835_SDHCI
|
||||
|
||||
#define CONFIG_CMD_USB
|
||||
#ifdef CONFIG_CMD_USB
|
||||
#define CONFIG_USB_DWC2
|
||||
#define CONFIG_USB_DWC2_REG_ADDR 0x20980000
|
||||
#define CONFIG_USB_STORAGE
|
||||
#define CONFIG_USB_HOST_ETHER
|
||||
#define CONFIG_USB_ETHER_SMSC95XX
|
||||
#define CONFIG_MISC_INIT_R
|
||||
#endif
|
||||
|
||||
/* Console UART */
|
||||
#define CONFIG_PL011_SERIAL
|
||||
#define CONFIG_PL011_CLOCK 3000000
|
||||
@@ -129,13 +139,7 @@
|
||||
|
||||
/* Some things don't make sense on this HW or yet */
|
||||
#undef CONFIG_CMD_FPGA
|
||||
#undef CONFIG_CMD_NET
|
||||
#undef CONFIG_CMD_NFS
|
||||
#undef CONFIG_CMD_SAVEENV
|
||||
#undef CONFIG_CMD_DHCP
|
||||
#undef CONFIG_CMD_MII
|
||||
#undef CONFIG_CMD_NET
|
||||
#undef CONFIG_CMD_PING
|
||||
|
||||
/* Environment */
|
||||
#define ENV_DEVICE_SETTINGS \
|
||||
@@ -176,7 +180,10 @@
|
||||
"ramdisk_addr_r=0x02100000\0" \
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0)
|
||||
func(MMC, mmc, 0) \
|
||||
func(USB, usb, 0) \
|
||||
func(PXE, pxe, na) \
|
||||
func(DHCP, dhcp, na)
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
#define __deprecated
|
||||
#endif
|
||||
|
||||
#include <linux/compat.h>
|
||||
|
||||
/* The USB role is defined by the connector used on the board, so long as
|
||||
* standards are being followed. (Developer boards sometimes won't.)
|
||||
*/
|
||||
|
||||
@@ -150,7 +150,8 @@ enum usb_init_type {
|
||||
defined(CONFIG_USB_OMAP3) || defined(CONFIG_USB_DA8XX) || \
|
||||
defined(CONFIG_USB_BLACKFIN) || defined(CONFIG_USB_AM35X) || \
|
||||
defined(CONFIG_USB_MUSB_DSPS) || defined(CONFIG_USB_MUSB_AM35X) || \
|
||||
defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined(CONFIG_USB_XHCI)
|
||||
defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined(CONFIG_USB_XHCI) || \
|
||||
defined(CONFIG_USB_DWC2)
|
||||
|
||||
int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
|
||||
int usb_lowlevel_stop(int index);
|
||||
|
||||
Reference in New Issue
Block a user