[U-Boot] [PATCH v6 61/76] spi-nor: Use CONFIG_MTD_SPI_NOR

Jagan Teki
2016-02-14T20:49:00Z

Replace legacy CONFIG_SPI_FLASH with CONFIG_MTD_SPI_NOR

Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
board/davinci/da8xxevm/da850evm.c | 2 +-
common/splash_source.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 356d3ce..7a2b8e0 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -234,7 +234,7 @@ const struct pinmux_resource pinmuxes[] = {
PINMUX_ITEM(emac_pins_mii),
#endif
#endif
-#ifdef CONFIG_SPI_FLASH
+#ifdef CONFIG_MTD_SPI_NOR
PINMUX_ITEM(spi1_pins_base),
PINMUX_ITEM(spi1_pins_scs0),
#endif
diff --git a/common/splash_source.c b/common/splash_source.c
index 3393f73..505fa2a 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -19,7 +19,7 @@

DECLARE_GLOBAL_DATA_PTR;

-#ifdef CONFIG_SPI_FLASH
+#ifdef CONFIG_MTD_SPI_NOR
static spi_flash_t *sf;
static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
{
--
1.9.1