Prepare v2013.07-rc2

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

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 91b43ee9df3a4b64cd017cb439653b5aa50cd9aa..e80785f55ef578ac989ceef262391bb602abdcec 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -38,12 +38,16 @@ struct spi_flash {
        u32             page_size;
        /* Erase (sector) size */
        u32             sector_size;
+#ifdef CONFIG_SPI_FLASH_BAR
        /* Bank read cmd */
        u8              bank_read_cmd;
        /* Bank write cmd */
        u8              bank_write_cmd;
        /* Current flash bank */
        u8              bank_curr;
+#endif
+       /* Poll cmd - for flash erase/program */
+       u8              poll_cmd;
 
        void *memory_map;       /* Address of read-only SPI flash access */
        int             (*read)(struct spi_flash *flash, u32 offset,