diff options
| author | Simon Glass <sjg@chromium.org> | 2020-10-03 11:31:38 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-10-29 14:42:18 -0600 |
| commit | d07f31aea07ec642e8072fe0b83ba56ec83cc561 (patch) | |
| tree | cbb73a80ae120ca50e62a3d16ff9c4bbf5af247c /drivers/spi/ich.c | |
| parent | 9e948b9b99d17ea6c2204a1b6251a5c33ee83dd9 (diff) | |
| download | u-boot-d07f31aea07ec642e8072fe0b83ba56ec83cc561.tar.gz | |
x86: apl: Enable SPI flash in TPL with APL_SPI_FLASH_BOOT
At present, enabling CONFIG_APL_SPI_FLASH_BOOT does not build since SPI
and SPI flash are not enabled for TPL. Add a condition to fix this and
tidy up a build warning in the SPI-flash driver.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/spi/ich.c')
| -rw-r--r-- | drivers/spi/ich.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index e1336b89c5..a91cb78568 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -615,6 +615,7 @@ static int ich_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) return ret; } +#if !CONFIG_IS_ENABLED(OF_PLATDATA) /** * ich_spi_get_basics() - Get basic information about the ICH device * @@ -657,6 +658,7 @@ static int ich_spi_get_basics(struct udevice *bus, bool can_probe, return ret; } +#endif /** * ich_get_mmap_bus() - Handle the get_mmap() method for a bus @@ -946,10 +948,10 @@ static int ich_spi_child_pre_probe(struct udevice *dev) static int ich_spi_ofdata_to_platdata(struct udevice *dev) { struct ich_spi_platdata *plat = dev_get_platdata(dev); - int ret; #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct ich_spi_priv *priv = dev_get_priv(dev); + int ret; ret = ich_spi_get_basics(dev, true, &priv->pch, &plat->ich_version, &plat->mmio_base); |