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.h | |
| parent | 04f005d552eb748582678a45119b55a99f75748e (diff) | |
| parent | 28964227069d3f0ff3110b8064d547f6cd9fcfa6 (diff) | |
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.h')
| -rw-r--r-- | include/spi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/spi.h b/include/spi.h index 5cc6d6e008..9b4fb8dc0b 100644 --- a/include/spi.h +++ b/include/spi.h @@ -39,7 +39,7 @@ #define SPI_DEFAULT_WORDLEN 8 -#ifdef CONFIG_DM_SPI +#if CONFIG_IS_ENABLED(DM_SPI) /* TODO(sjg@chromium.org): Remove this and use max_hz from struct spi_slave */ struct dm_spi_bus { uint max_hz; @@ -131,7 +131,7 @@ enum spi_polarity { * @flags: Indication of SPI flags. */ struct spi_slave { -#ifdef CONFIG_DM_SPI +#if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev; /* struct spi_slave is dev->parentdata */ uint max_hz; uint speed; @@ -317,7 +317,7 @@ void spi_flash_copy_mmap(void *data, void *offset, size_t len); */ int spi_cs_is_valid(unsigned int bus, unsigned int cs); -#ifndef CONFIG_DM_SPI +#if !CONFIG_IS_ENABLED(DM_SPI) /** * Activate a SPI chipselect. * This function is provided by the board code when using a driver @@ -367,7 +367,7 @@ static inline int spi_w8r8(struct spi_slave *slave, unsigned char byte) return ret < 0 ? ret : din[1]; } -#ifdef CONFIG_DM_SPI +#if CONFIG_IS_ENABLED(DM_SPI) /** * struct spi_cs_info - Information about a bus chip select |