Merge branch 'u-boot/master'

[karo-tx-uboot.git] / include / spi_flash.h

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 36f1f033c0c20db78a38c0fe6443ef566190340e..2db53c74c88efa794eeacab10220d49d56bd0a31 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -40,6 +40,7 @@ enum spi_read_cmds {
 enum spi_dual_flash {
        SF_SINGLE_FLASH = 0,
        SF_DUAL_STACKED_FLASH = 1 << 0,
+       SF_DUAL_PARALLEL_FLASH = 1 << 1,
 };
 
 /**
@@ -51,7 +52,7 @@ enum spi_dual_flash {
  * @sector_size:       Sector size of this device
  * @nr_sectors:                No.of sectors on this device
  * @e_rd_cmd:          Enum list for read commands
- * @flags:             Importent param, for flash specific behaviour
+ * @flags:             Important param, for flash specific behaviour
  */
 struct spi_flash_params {
        const char *name;
@@ -70,7 +71,8 @@ extern const struct spi_flash_params spi_flash_params_table[];
  *
  * @spi:               SPI slave
  * @name:              Name of SPI flash
- * @dual_flash:                Indicates dual flash memories - dual stacked
+ * @dual_flash:                Indicates dual flash memories - dual stacked, parallel
+ * @shift:             Flash shift useful in dual parallel
  * @size:              Total flash size
  * @page_size:         Write (page) size
  * @sector_size:       Sector size
@@ -86,16 +88,17 @@ extern const struct spi_flash_params spi_flash_params_table[];
  * @memory_map:                Address of read-only SPI flash access
  * @read:              Flash read ops: Read len bytes at offset into buf
  *                     Supported cmds: Fast Array Read
- * @write:             Flash write ops: Write len bytes from buf into offeset
+ * @write:             Flash write ops: Write len bytes from buf into offset
  *                     Supported cmds: Page Program
  * @erase:             Flash erase ops: Erase len bytes from offset
  *                     Supported cmds: Sector erase 4K, 32K, 64K
- * return 0 - Sucess, 1 - Failure
+ * return 0 - Success, 1 - Failure
  */
 struct spi_flash {
        struct spi_slave *spi;
        const char *name;
        u8 dual_flash;
+       u8 shift;
 
        u32 size;
        u32 page_size;
@@ -155,5 +158,6 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
 }
 
 void spi_boot(void) __noreturn;
+void spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst);
 
 #endif /* _SPI_FLASH_H_ */