diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2016-06-14 14:13:04 +0200 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-03-09 01:40:12 +0100 |
| commit | 5eba355c991c77819f10faeb5521238d595a6635 (patch) | |
| tree | 5ea8ff54780455a1419407dbe80192e1d3335a5e /include | |
| parent | ec8f114b3d19ea86fdb2d8d5c447fddbe48e9c31 (diff) | |
SPI flash: fixes for non-DM SPL
Diffstat (limited to 'include')
| -rw-r--r-- | include/spi_flash.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/spi_flash.h b/include/spi_flash.h index be2fe3f84c..d6cfe201c6 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -89,7 +89,7 @@ struct spi_flash { int (*flash_lock)(struct spi_flash *flash, u32 ofs, size_t len); int (*flash_unlock)(struct spi_flash *flash, u32 ofs, size_t len); int (*flash_is_locked)(struct spi_flash *flash, u32 ofs, size_t len); -#ifndef CONFIG_DM_SPI_FLASH +#if !defined(CONFIG_DM_SPI_FLASH) || defined(CONFIG_SPL_BUILD) /* * These are not strictly needed for driver model, but keep them here * while the transition is in progress. @@ -118,7 +118,7 @@ struct dm_spi_flash_ops { /* Access the serial operations for a device */ #define sf_get_ops(dev) ((struct dm_spi_flash_ops *)(dev)->driver->ops) -#ifdef CONFIG_DM_SPI_FLASH +#if defined(CONFIG_DM_SPI_FLASH) && !defined(CONFIG_SPL_BUILD) /** * spi_flash_read_dm() - Read data from SPI flash * |