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

diff --combined README
index 766e9e0ebd88f05741ea6cf34657ace277dd75d6,573666eeedd0da6b2019a3b469ab6fe2d01db8ee..46def0086b8f3d95c77a78bda532eacdbab91c6e
--- 1/README
--- 2/README
+++ b/README
@@@ -538,6 -538,12 +538,12 @@@ The following options need to be config
                interleaving mode, handled by Dickens for Freescale layerscape
                SoCs with ARM core.
  
+               CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS
+               Number of controllers used as main memory.
+ 
+               CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
+               Number of controllers used for other than main memory.
+ 
  - Intel Monahans options:
                CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO
  
@@@ -1628,16 -1634,6 +1634,16 @@@
                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.
 +
 +              CONFIG_FASTBOOT_FLASH
 +              The fastboot protocol includes a "flash" command for writing
 +              the downloaded image to a non-volatile storage device. Define
 +              this to enable the "fastboot flash" command.
 +
 +              CONFIG_FASTBOOT_FLASH_MMC_DEV
 +              The fastboot "flash" command requires additional information
 +              regarding the non-volatile storage device. Define this to
 +              the eMMC device that fastboot should use to store the image.
  
  - Journaling Flash filesystem support:
                CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE,