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>

diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig
index 35a425cd1bc2e31741d681a2947d4e4e3a8bcde2..c6c1350f4f082a16049bb9326158aef10b746fd4 100644 (file)
--- a/arch/x86/cpu/apollolake/Kconfig
+++ b/arch/x86/cpu/apollolake/Kconfig
@@ -85,6 +85,8 @@ config APL_SPI_FLASH_BOOT
        bool "Support booting with SPI-flash driver instead memory-mapped SPI"
        select TPL_SPI_FLASH_SUPPORT
        select TPL_SPI_SUPPORT
+       select TPL_DM_SPI
+       select TPL_DM_SPI_FLASH
        help
          This enables SPI and SPI flash in TPL. Without the this only
          available boot method is to use memory-mapped SPI. Since this is

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index e1336b89c5a74d4b39ea2be796429d280ef832d2..a91cb785680a8ce127f3384d242944f44a842b3f 100644 (file)
--- 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);