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

diff --combined README
index d6be5965de64e5857c4379d677430804792062f3,0bd4069da63a16b01b07e68ca9eed4ed5346c323..a280435e9fbec65012cf9758a66f6827d2f22353
--- 1/README
--- 2/README
+++ b/README
@@@ -1534,6 -1534,16 +1534,16 @@@ The following options need to be config
                        CONFIG_SH_MMCIF_CLK
                        Define the clock frequency for MMCIF
  
+               CONFIG_GENERIC_MMC
+               Enable the generic MMC driver
+ 
+               CONFIG_SUPPORT_EMMC_BOOT
+               Enable some additional features of the eMMC boot partitions.
+ 
+               CONFIG_SUPPORT_EMMC_RPMB
+               Enable the commands for reading, writing and programming the
+               key for the Replay Protection Memory Block partition in eMMC.
+ 
  - USB Device Firmware Update (DFU) class support:
                CONFIG_DFU_FUNCTION
                This enables the USB portion of the DFU USB class
@@@ -1579,28 -1589,6 +1589,28 @@@
                entering dfuMANIFEST state. Host waits this timeout, before
                sending again an USB request to the device.
  
 +- USB Device Android Fastboot support:
 +              CONFIG_CMD_FASTBOOT
 +              This enables the command "fastboot" which enables the Android
 +              fastboot mode for the platform's USB device. Fastboot is a USB
 +              protocol for downloading images, flashing and device control
 +              used on Android devices.
 +              See doc/README.android-fastboot for more information.
 +
 +              CONFIG_ANDROID_BOOT_IMAGE
 +              This enables support for booting images which use the Android
 +              image format header.
 +
 +              CONFIG_USB_FASTBOOT_BUF_ADDR
 +              The fastboot protocol requires a large memory buffer for
 +              downloads. Define this to the starting RAM address to use for
 +              downloaded images.
 +
 +              CONFIG_USB_FASTBOOT_BUF_SIZE
 +              The fastboot protocol requires a large memory buffer for
 +              downloads. This buffer should be as large as possible for a
 +              platform. Define this to the size available RAM for fastboot.
 +
  - Journaling Flash filesystem support:
                CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE,
                CONFIG_JFFS2_NAND_DEV
@@@ -2572,19 -2560,6 +2582,19 @@@ CBFS (Coreboot Filesystem) suppor
  
                Specify the number of FPGA devices to support.
  
 +              CONFIG_CMD_FPGA_LOADMK
 +
 +              Enable support for fpga loadmk command
 +
 +              CONFIG_CMD_FPGA_LOADP
 +
 +              Enable support for fpga loadp command - load partial bitstream
 +
 +              CONFIG_CMD_FPGA_LOADBP
 +
 +              Enable support for fpga loadbp command - load partial bitstream
 +              (Xilinx only)
 +
                CONFIG_SYS_FPGA_PROG_FEEDBACK
  
                Enable printing of hash marks during FPGA configuration.