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

* 'master' of git://git.denx.de/u-boot-usb:
  Enable high speed support for USB device framework and usbtty

diff --combined README
index 90a79bfbccef86239f2929a940138e26896adf3c,0ab689257eba10011bd9a5f6fbfdd5e29641d7ca..c98afa74b18f68a866a4283bc5c0785374e6fd3f
--- 1/README
--- 2/README
+++ b/README
@@@ -1125,9 -1125,6 +1125,9 @@@ The following options need to be config
                                May be defined to allow interrupt polling
                                instead of using asynchronous interrupts
  
 +              CONFIG_USB_EHCI_TXFIFO_THRESH enables setting of the
 +              txfilltuning field in the EHCI controller on reset.
 +
  - USB Device:
                Define the below if you wish to use the USB console.
                Once firmware is rebuilt from a serial console issue the
@@@ -1151,6 -1148,14 +1151,14 @@@
                        Define this to have a tty type of device available to
                        talk to the UDC device
  
+                       CONFIG_USBD_HS
+                       Define this to enable the high speed support for usb
+                       device and usbtty. If this feature is enabled, a routine
+                       int is_usbd_high_speed(void)
+                       also needs to be defined by the driver to dynamically poll
+                       whether the enumeration has succeded at high speed or full
+                       speed.
+ 
                        CONFIG_SYS_CONSOLE_IS_IN_ENV
                        Define this if you want stdin, stdout &/or stderr to
                        be set to usbtty.
@@@ -1236,12 -1241,8 +1244,12 @@@
  
  - FAT(File Allocation Table) filesystem write function support:
                CONFIG_FAT_WRITE
 -              Support for saving memory data as a file
 -              in FAT formatted partition
 +
 +              Define this to enable support for saving memory data as a
 +              file in FAT formatted partition.
 +
 +              This will also enable the command "fatwrite" enabling the
 +              user to write files to FAT.
  
  - Keyboard Support:
                CONFIG_ISA_KEYBOARD
@@@ -2471,29 -2472,11 +2479,29 @@@ FIT uImage format
                CONFIG_SPL
                Enable building of SPL globally.
  
 +              CONFIG_SPL_LDSCRIPT
 +              LDSCRIPT for linking the SPL binary.
 +
 +              CONFIG_SPL_MAX_SIZE
 +              Maximum binary size (text, data and rodata) of the SPL binary.
 +
                CONFIG_SPL_TEXT_BASE
                TEXT_BASE for linking the SPL binary.
  
 -              CONFIG_SPL_LDSCRIPT
 -              LDSCRIPT for linking the SPL binary.
 +              CONFIG_SPL_BSS_START_ADDR
 +              Link address for the BSS within the SPL binary.
 +
 +              CONFIG_SPL_BSS_MAX_SIZE
 +              Maximum binary size of the BSS section of the SPL binary.
 +
 +              CONFIG_SPL_STACK
 +              Adress of the start of the stack SPL will use
 +
 +              CONFIG_SYS_SPL_MALLOC_START
 +              Starting address of the malloc pool used in SPL.
 +
 +              CONFIG_SYS_SPL_MALLOC_SIZE
 +              The size of the malloc pool used in SPL.
  
                CONFIG_SPL_LIBCOMMON_SUPPORT
                Support for common/libcommon.o in SPL binary
@@@ -2510,45 -2493,6 +2518,45 @@@
                CONFIG_SPL_MMC_SUPPORT
                Support for drivers/mmc/libmmc.o in SPL binary
  
 +              CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
 +              CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS,
 +              CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION
 +              Address, size and partition on the MMC to load U-Boot from
 +              when the MMC is being used in raw mode.
 +
 +              CONFIG_SPL_FAT_SUPPORT
 +              Support for fs/fat/libfat.o in SPL binary
 +
 +              CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME
 +              Filename to read to load U-Boot when reading from FAT
 +
 +              CONFIG_SPL_NAND_SIMPLE
 +              Support for drivers/mtd/nand/libnand.o in SPL binary
 +
 +              CONFIG_SYS_NAND_5_ADDR_CYCLE, CONFIG_SYS_NAND_PAGE_COUNT,
 +              CONFIG_SYS_NAND_PAGE_SIZE, CONFIG_SYS_NAND_OOBSIZE,
 +              CONFIG_SYS_NAND_BLOCK_SIZE, CONFIG_SYS_NAND_BAD_BLOCK_POS,
 +              CONFIG_SYS_NAND_ECCPOS, CONFIG_SYS_NAND_ECCSIZE,
 +              CONFIG_SYS_NAND_ECCBYTES
 +              Defines the size and behavior of the NAND that SPL uses
 +              to read U-Boot with CONFIG_SPL_NAND_SIMPLE
 +
 +              CONFIG_SYS_NAND_U_BOOT_OFFS
 +              Location in NAND for CONFIG_SPL_NAND_SIMPLE to read U-Boot
 +              from.
 +
 +              CONFIG_SYS_NAND_U_BOOT_START
 +              Location in memory for CONFIG_SPL_NAND_SIMPLE to load U-Boot
 +              to.
 +
 +              CONFIG_SYS_NAND_HW_ECC_OOBFIRST
 +              Define this if you need to first read the OOB and then the
 +              data. This is used for example on davinci plattforms.
 +
 +              CONFIG_SPL_OMAP3_ID_NAND
 +              Support for an OMAP3-specific set of functions to return the
 +              ID and MFR of the first attached NAND chip, if present.
 +
                CONFIG_SPL_SERIAL_SUPPORT
                Support for drivers/serial/libserial.o in SPL binary
  
@@@ -2558,6 -2502,9 +2566,6 @@@
                CONFIG_SPL_SPI_SUPPORT
                Support for drivers/spi/libspi.o in SPL binary
  
 -              CONFIG_SPL_FAT_SUPPORT
 -              Support for fs/fat/libfat.o in SPL binary
 -
                CONFIG_SPL_LIBGENERIC_SUPPORT
                Support for lib/libgeneric.o in SPL binary
  
@@@ -3405,6 -3352,11 +3413,6 @@@ Low Level (hardware related) configurat
                that is executed before the actual U-Boot. E.g. when
                compiling a NAND SPL.
  
 -- CONFIG_SYS_NAND_HW_ECC_OOBFIRST
 -              define this, if you want to read first the oob data
 -              and then the data. This is used for example on
 -              davinci plattforms.
 -
  - CONFIG_USE_ARCH_MEMCPY
    CONFIG_USE_ARCH_MEMSET
                If these options are used a optimized version of memcpy/memset will
@@@ -3609,7 -3561,6 +3617,7 @@@ go      - start application at address 'addr
  run   - run commands in an environment variable
  bootm - boot application image from memory
  bootp - boot image via network using BootP/TFTP protocol
 +bootz   - boot zImage from memory
  tftpboot- boot image via network using TFTP protocol
               and env variables "ipaddr" and "serverip"
               (and eventually "gatewayip")
@@@ -4430,18 -4381,6 +4438,18 @@@ U-Boot supports the following image typ
        useful when you configure U-Boot to use a real shell (hush)
        as command interpreter.
  
 +Booting the Linux zImage:
 +-------------------------
 +
 +On some platforms, it's possible to boot Linux zImage. This is done
 +using the "bootz" command. The syntax of "bootz" command is the same
 +as the syntax of "bootm" command.
 +
 +Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
 +kernel with raw initrd images. The syntax is slightly different, the
 +address of the initrd must be augmented by it's size, in the following
 +format: "<initrd addres>:<initrd size>".
 +
  
  Standalone HOWTO:
  =================