Message ID | 1410784427-23909-10-git-send-email-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 3772614017A for <incoming@patchwork.ozlabs.org>; Mon, 15 Sep 2014 22:35:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 44265A7A72; Mon, 15 Sep 2014 14:35:02 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 9qDZSZG9sRQK; Mon, 15 Sep 2014 14:35:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D05D3A7A74; Mon, 15 Sep 2014 14:34:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B35CA7A69 for <u-boot@lists.denx.de>; Mon, 15 Sep 2014 14:34:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 Umm-TyMeGZIK for <u-boot@lists.denx.de>; Mon, 15 Sep 2014 14:34:15 +0200 (CEST) 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-ig0-f201.google.com (mail-ig0-f201.google.com [209.85.213.201]) by theia.denx.de (Postfix) with ESMTPS id 4BAC5A7A56 for <u-boot@lists.denx.de>; Mon, 15 Sep 2014 14:34:08 +0200 (CEST) Received: by mail-ig0-f201.google.com with SMTP id l13so531368iga.0 for <u-boot@lists.denx.de>; Mon, 15 Sep 2014 05:34:07 -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=N9T8pdx4nCCvFzv+Mgbx5bxA21HyO5SbXu0Sb/8TPvA=; b=LVgXEl3qwLUhalqo57ih0MpgggmCNQYNZnzby2XyWWbhyx+5ljjok2IMvv8A582RH9 YEERd+b95/I2UCgC7kI/TBKQPEjnHFPMLCRlimGnRknS1aiWZRV0tALXeQ++8mps7jkb 5DcJ/eM9UV+k0Ob6TuVnp7tZkoZpoSqnDpqvrGcXPYHssrLc5TLaSSusYIj+T+pMPi4y MjgnrBDAVTWLJy8ZQdWMneIb9vVrinCfoJElH6VZfZPWvRBUjswhkRQKxNJcEUhxQh5w m5lEHvYG6N6IFnYQYmndu44H0DqGVU4KiQf7+2NZVgzLcSV/+vR3nxNqo65QCOmaycf1 ir3Q== X-Gm-Message-State: ALoCoQmotLneshRfG7m8PaWT0p0TV0GlRy1OV9jZlMq7LnYvfQEDlC4sCg4s/KwZp6ECcEeWGAPY X-Received: by 10.182.230.133 with SMTP id sy5mr15524664obc.22.1410784447100; Mon, 15 Sep 2014 05:34:07 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id m14si530655yhm.7.2014.09.15.05.34.06 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Sep 2014 05:34:07 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id oeo5ry3n.1; Mon, 15 Sep 2014 05:34:07 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A4934222518; Mon, 15 Sep 2014 06:34:05 -0600 (MDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Mon, 15 Sep 2014 06:33:26 -0600 Message-Id: <1410784427-23909-10-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1410784427-23909-1-git-send-email-sjg@chromium.org> References: <1410784427-23909-1-git-send-email-sjg@chromium.org> Cc: u-boot-review@google.com, Jagannadha Sutradharudu Teki <jaganna@xilinx.com> Subject: [U-Boot] [PATCH v2 09/30] dm: Remove spi_init() from board_r.c when using driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de |
diff --git a/common/board_r.c b/common/board_r.c index 231c6d6..cd92288 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -354,7 +354,7 @@ static int initr_flash(void) } #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) static int initr_spi(void) { /* PPC does this here */
Driver model does its own init, so we don't need this. There is still a call in board_f.c but it is only enabled by CONFIG_HARD_SPI. It is easy enough to disable that option when converting boards which use it to driver model. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: - Fix a typo in the commit message common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)