From patchwork Sun Feb 14 20:49:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 582611 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B2FF614031F for ; Mon, 15 Feb 2016 08:02:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E438A770B; Sun, 14 Feb 2016 21:56:35 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2MFmTtvdF1AC; Sun, 14 Feb 2016 21:56:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF1E5B37D6; Sun, 14 Feb 2016 21:55:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 04F44A7742 for ; Sun, 14 Feb 2016 21:55:13 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IWA8H7MU0TFV for ; Sun, 14 Feb 2016 21:55:12 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by theia.denx.de (Postfix) with ESMTPS id 1F322A7749 for ; Sun, 14 Feb 2016 21:54:09 +0100 (CET) Received: by mail-pf0-f170.google.com with SMTP id e127so75995208pfe.3 for ; Sun, 14 Feb 2016 12:54:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0zwV/gq9D1rElmFnPxP4yGkBR+z4XoAZOq2hPqh0c0Y=; b=Wvj/kQgGfN8w95JCDf7CqGR/X0VWk2m9OXPb0jWDQJxYasc0KFzHJPULUtsX5H6QBs hc5uRniswdkEssrXuSiAyPWWwC9r41+sdssMic/tDgotOJ68nsti8mo1f4PnLduH1SFD 18enZa5h0m63PI9eRcN4qJdRZzeeMOm/EEsYOCxcyPNewRuFS15gLOCWW/k589yVG0xR mv+Ol54rVWecVfv0tLbkvGnL7Q0Vui4bTULX2Z85ZlfQYZZfQ9Xa9nWfd26BDMkSRbsM TvwFkb8yO3xRT+A6jyhrNbiC3sxu9NgdRRyGQFzE0zUKIR/cyE2Px9S6PAFDtxDs3mR6 05Kw== X-Gm-Message-State: AG10YORUb3bLxHXV8HNEjtM1KIPU8RTODGm0955oyMVry0NDJkmqecVgwv3WHWSSePTpCQ== X-Received: by 10.98.66.138 with SMTP id h10mr18900304pfd.89.1455483247926; Sun, 14 Feb 2016 12:54:07 -0800 (PST) Received: from localhost.localdomain ([123.236.183.254]) by smtp.gmail.com with ESMTPSA id cq9sm11423890pac.26.2016.02.14.12.54.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 12:54:06 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 15 Feb 2016 02:19:00 +0530 Message-Id: <1455482955-19053-61-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v6 61/76] spi-nor: Use CONFIG_MTD_SPI_NOR X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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) {