From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Date: Mon, 15 Feb 2016 02:19:00 +0530 Subject: [U-Boot] [PATCH v6 61/76] spi-nor: Use CONFIG_MTD_SPI_NOR In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Message-ID: <1455482955-19053-61-git-send-email-jteki@openedev.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Replace legacy CONFIG_SPI_FLASH with CONFIG_MTD_SPI_NOR Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- 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