From: Tom Rini <trini@ti.com>
Date: Fri, 8 Nov 2013 20:25:29 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-usb
X-Git-Tag: v2014.01-rc1~78
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f;hp=-c

Merge branch 'master' of git://www.denx.de/git/u-boot-usb
---

15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f
diff --combined README
index 8e19aebb9c,b0c2fdc73d..a70475fb05
--- a/README
+++ b/README
@@@ -848,7 -848,6 +848,7 @@@ The following options need to be config
  		CONFIG_CMD_ELF		* bootelf, bootvx
  		CONFIG_CMD_ENV_CALLBACK	* display details about env callbacks
  		CONFIG_CMD_ENV_FLAGS	* display details about env flags
 +		CONFIG_CMD_ENV_EXISTS	* check existence of env variable
  		CONFIG_CMD_EXPORTENV	* export the environment
  		CONFIG_CMD_EXT2		* ext2 command support
  		CONFIG_CMD_EXT4		* ext4 command support
@@@ -1033,6 -1032,7 +1033,6 @@@
  
  - GPIO Support:
  		CONFIG_PCA953X		- use NXP's PCA953X series I2C GPIO
 -		CONFIG_PCA953X_INFO	- enable pca953x info command
  
  		The CONFIG_SYS_I2C_PCA953X_WIDTH option specifies a list of
  		chip-ngpio pairs that tell the PCA953X driver the number of
@@@ -1367,6 -1367,13 +1367,13 @@@
  			for your device
  			- CONFIG_USBD_PRODUCTID 0xFFFF
  
+ 		Some USB device drivers may need to check USB cable attachment.
+ 		In this case you can enable following config in BoardName.h:
+ 			CONFIG_USB_CABLE_CHECK
+ 			This enables function definition:
+ 			- usb_cable_connected() in include/usb.h
+ 			Implementation of this function is board-specific.
+ 
  - ULPI Layer Support:
  		The ULPI (UTMI Low Pin (count) Interface) PHYs are supported via
  		the generic ULPI layer. The generic layer accesses the ULPI PHY