diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
commit | 50c9b0e1ddce280823484579c4ecc1f069e7833b (patch) | |
tree | 16908165e841adefa0e68693bf07a7fdb67084ab /include/spi_flash.h | |
parent | 04f005d552eb748582678a45119b55a99f75748e (diff) | |
parent | 28964227069d3f0ff3110b8064d547f6cd9fcfa6 (diff) | |
download | u-boot-50c9b0e1ddce280823484579c4ecc1f069e7833b.tar.gz u-boot-50c9b0e1ddce280823484579c4ecc1f069e7833b.tar.xz u-boot-50c9b0e1ddce280823484579c4ecc1f069e7833b.zip |
Merge branch '2020-06-26-more-Kconfig-migration' into next
- Bring in the first pass at cleaning up config headers that reference
symbols that already have Kconfig symbols.
- In order to do that, bring in the small series that adds
CONFIG_SPL_DM_SPI_FLASH and makes more use of CONFIG_$(SPL_TPL_)DM_SPI
in order to allow for disabling those features in SPL stuff but using
them in full U-Boot
Diffstat (limited to 'include/spi_flash.h')
-rw-r--r-- | include/spi_flash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/spi_flash.h b/include/spi_flash.h index d9b2af856c..b336619487 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -39,7 +39,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 CONFIG_IS_ENABLED(DM_SPI_FLASH) /** * spi_flash_read_dm() - Read data from SPI flash * |