From patchwork Tue Mar 22 07:38:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 600467 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 3qTlJD2Nstz9s5l for ; Tue, 22 Mar 2016 18:51:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A7F0A789F; Tue, 22 Mar 2016 08:45:42 +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 YrPwKmd46oMi; Tue, 22 Mar 2016 08:45:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DAC08A78A0; Tue, 22 Mar 2016 08:44:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B4C3A7669 for ; Tue, 22 Mar 2016 08:44:15 +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 XktHOm24suiC for ; Tue, 22 Mar 2016 08:44:15 +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-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by theia.denx.de (Postfix) with ESMTPS id C53A5A781D for ; Tue, 22 Mar 2016 08:43:31 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id u190so34380224pfb.2 for ; Tue, 22 Mar 2016 00:43:31 -0700 (PDT) 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=JFPYWAU42/0syZBAN7oBMIA84pTxOuVxjnsoGn7gcEv+5kY9w0+3eIUh395c7kPyrI fRRenBbb6ghbWu2vGQ94+fj6M6FfAXwKfRMr6dbd2GqIjCK0NTv8JWCaa2DSWJ7QJB4l C0G7UpDkfgEuq7WKqMHHYisQH8eYWg5gleXrYdPMYI5lgpPC+s5MMq4L16oju3RKsfe0 dPWPvC/b0S/qhzmzxLpHPFURPD49NEY8biPtgpjDXT7PRmo3gMQ6mgWy6ffmdTOihVRa JJ7p4dZYwkxPujQQ0qvGoLKiABn16PLqe2LTBPzwokNEXDJmfoL0LTX8IVA4QgnaaMRq 3upw== X-Gm-Message-State: AD7BkJL3eadfFGcW562yE7F82no/RWJj/VQyHLNJAVgA2o0SPO3kaOInZgVPsCFUK64Ypw== X-Received: by 10.66.250.199 with SMTP id ze7mr52161382pac.103.1458632610503; Tue, 22 Mar 2016 00:43:30 -0700 (PDT) Received: from jteki-Latitude-E7450.amcc.com ([182.73.239.130]) by smtp.gmail.com with ESMTPSA id ko9sm45814957pab.37.2016.03.22.00.43.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Mar 2016 00:43:29 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Date: Tue, 22 Mar 2016 13:08:12 +0530 Message-Id: <1458632319-24866-60-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458632319-24866-1-git-send-email-jteki@openedev.com> References: <1458632319-24866-1-git-send-email-jteki@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v7 60/87] 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) {