Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze

diff --combined README
index d8fcd95f9423a877edb04bafa4e34249f29017b2,13cdac410937320ca805ce3c9df23bd18af6393e..d6be5965de64e5857c4379d677430804792062f3
--- 1/README
--- 2/README
+++ b/README
@@@ -1579,28 -1579,6 +1579,28 @@@ The following options need to be config
                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,6 -2550,19 +2572,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.