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

diff --combined README
index a248ab5d39fc85438ba4adc6ffd0141a5dffd99c,a085625841c8f84f29af35c269045a57a6b90d99..7129df822c17c9c9bc5c7089ec54b0fed6381d01
--- 1/README
--- 2/README
+++ b/README
@@@ -321,6 -321,14 +321,6 @@@ The following options need to be config
                                          the LCD display every second with
                                          a "rotator" |\-/|\-/
  
 -- Board flavour: (if CONFIG_MPC8260ADS is defined)
 -              CONFIG_ADSTYPE
 -              Possible values are:
 -                      CONFIG_SYS_8260ADS      - original MPC8260ADS
 -                      CONFIG_SYS_8266ADS      - MPC8266ADS
 -                      CONFIG_SYS_PQ2FADS      - PQ2FADS-ZU or PQ2FADS-VR
 -                      CONFIG_SYS_8272ADS      - MPC8272ADS
 -
  - Marvell Family Member
                CONFIG_SYS_MVFS         - define it if you want to enable
                                          multiple fs option at one time
@@@ -1424,9 -1432,6 +1424,6 @@@
                CONFIG_USB_EHCI_TXFIFO_THRESH enables setting of the
                txfilltuning field in the EHCI controller on reset.
  
-               CONFIG_USB_HUB_MIN_POWER_ON_DELAY defines the minimum
-               interval for usb hub power-on delay.(minimum 100msec)
- 
  - USB Device:
                Define the below if you wish to use the USB console.
                Once firmware is rebuilt from a serial console issue the
@@@ -1637,12 -1642,6 +1634,12 @@@ CBFS (Coreboot Filesystem) suppor
                filesystem. Available commands are cbfsinit, cbfsinfo, cbfsls
                and cbfsload.
  
 +- FAT(File Allocation Table) filesystem cluster size:
 +              CONFIG_FS_FAT_MAX_CLUSTSIZE
 +
 +              Define the max cluster size for fat operations else
 +              a default value of 65536 will be defined.
 +
  - Keyboard Support:
                CONFIG_ISA_KEYBOARD
  
@@@ -3200,19 -3199,6 +3197,19 @@@ FIT uImage format
   -150 common/cmd_nand.c       Incorrect FIT image format
    151 common/cmd_nand.c       FIT image format OK
  
 +- legacy image format:
 +              CONFIG_IMAGE_FORMAT_LEGACY
 +              enables the legacy image format support in U-Boot.
 +
 +              Default:
 +              enabled if CONFIG_FIT_SIGNATURE is not defined.
 +
 +              CONFIG_DISABLE_IMAGE_LEGACY
 +              disable the legacy image format
 +
 +              This define is introduced, as the legacy image format is
 +              enabled per default for backward compatibility.
 +
  - FIT image support:
                CONFIG_FIT
                Enable support for the FIT uImage format.
@@@ -3229,11 -3215,6 +3226,11 @@@
                using a hash signed and verified using RSA. See
                doc/uImage.FIT/signature.txt for more details.
  
 +              WARNING: When relying on signed FIT images with required
 +              signature check the legacy image format is default
 +              disabled. If a board need legacy image format support
 +              enable this through CONFIG_IMAGE_FORMAT_LEGACY
 +
  - Standalone program support:
                CONFIG_STANDALONE_LOAD_ADDR
  

diff --combined include/configs/cm_t35.h
index 8c60e22c1dd053e5e98c1deff068b470c6066469,f6acf6920524070e340e2653daa6000d11c671e7..5c484ef07882510cc02dd839b12c1e9530fee5f9
--- 1/include/configs/cm_t35.h
--- 2/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@@ -104,8 -104,6 +104,6 @@@
  #define CONFIG_USB_DEVICE
  #define CONFIG_USB_TTY
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
- /* This delay is really for slow-to-power-on USB sticks, not the hub */
- #define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 500
  
  /* commands to include */
  #include <config_cmd_default.h>
@@@ -158,6 -156,7 +156,6 @@@
                                                        /* CS0 */
  #define CONFIG_SYS_MAX_NAND_DEVICE    1               /* Max number of NAND */
                                                        /* devices */
 -#define GPMC_NAND_ECC_LP_x8_LAYOUT
  
  /* Environment information */
  #define CONFIG_BOOTDELAY              3