Merge branch 'sf' of git://git.denx.de/u-boot-blackfin

* 'sf' of git://git.denx.de/u-boot-blackfin:
  README: Add description of SPI Flash (SF) command configuration
  sf command: allow default bus and chip selects
  sf: eeprom_m95xxx: set a sane default timeout
  sf: eeprom_m95xxx: fix up style

diff --combined README
index b6c9d0b0e957da172f365e82c38b9fecc39058eb,52cf37c1f80315969ef50b8ee6f10e95013778c6..eba6378536858da57d307e6f7d9721930b00f782
--- 1/README
--- 2/README
+++ b/README
@@@ -420,12 -420,6 +420,12 @@@ The following options need to be config
                XWAY SoCs for booting from NOR flash. The U-Boot image needs to
                be swapped if a flash programmer is used.
  
 +- ARM options:
 +              CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 +
 +              Select high exception vectors of the ARM core, e.g., do not
 +              clear the V bit of the c1 register of CP15.
 +
  - Linux Kernel Interface:
                CONFIG_CLOCKS_IN_MHZ
  
@@@ -815,6 -809,7 +815,7 @@@
                                          (requires CONFIG_CMD_I2C)
                CONFIG_CMD_SETGETDCR      Support for DCR Register access
                                          (4xx only)
+               CONFIG_CMD_SF           * Read/write/erase SPI NOR flash
                CONFIG_CMD_SHA1SUM        print sha1 memory digest
                                          (requires CONFIG_CMD_MEMORY)
                CONFIG_CMD_SOURCE         "source" command Support
@@@ -2197,6 -2192,25 +2198,25 @@@
                allows to read/write in Dataflash via the standard
                commands cp, md...
  
+ - Serial Flash support
+               CONFIG_CMD_SF
+ 
+               Defining this option enables SPI flash commands
+               'sf probe/read/write/erase/update'.
+ 
+               Usage requires an initial 'probe' to define the serial
+               flash parameters, followed by read/write/erase/update
+               commands.
+ 
+               The following defaults may be provided by the platform
+               to handle the common case when only a single serial
+               flash is present on the system.
+ 
+               CONFIG_SF_DEFAULT_BUS           Bus identifier
+               CONFIG_SF_DEFAULT_CS            Chip-select
+               CONFIG_SF_DEFAULT_MODE          (see include/spi.h)
+               CONFIG_SF_DEFAULT_SPEED         in Hz
+ 
  - SystemACE Support:
                CONFIG_SYSTEMACE