Message ID | 1405385792-4469-9-git-send-email-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Jagannadha Sutradharudu Teki |
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 DEFA4140142 for <incoming@patchwork.ozlabs.org>; Tue, 15 Jul 2014 11:00:06 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C0DA9A7579; Tue, 15 Jul 2014 02:59:57 +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 n4v8FrT3vLVE; Tue, 15 Jul 2014 02:59:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BA96BA75B3; Tue, 15 Jul 2014 02:58:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F71EA7575 for <u-boot@lists.denx.de>; Tue, 15 Jul 2014 02:58:25 +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 bnz2lWQLOBg8 for <u-boot@lists.denx.de>; Tue, 15 Jul 2014 02:58:22 +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-qc0-f201.google.com (mail-qc0-f201.google.com [209.85.216.201]) by theia.denx.de (Postfix) with ESMTPS id 79CBDA7579 for <u-boot@lists.denx.de>; Tue, 15 Jul 2014 02:58:07 +0200 (CEST) Received: by mail-qc0-f201.google.com with SMTP id m20so490818qcx.4 for <u-boot@lists.denx.de>; Mon, 14 Jul 2014 17:58:06 -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=JZM1IBmb7OINL++wPkhUF5yihZMMZdYEUNi9Xn03G7E=; b=Ixk/Pcd//PEc2BexYCEoUqC85aMV0aOyxsSxvMaGqOhH6J1PA6B2bGeaS2ZE09KOU0 dKhCbir6AKSljhbl4/ZKvRc4P3rmZIU8jo5oX/vAJc/rKJHjYHihTSd5BjlWr8y9c0GH Z5/bZk4Kpvb3mEeNUnQUsZVgJ6b6U7mnfGSgkisniM6i3C5iZlACA81+XuG2cDD/ooH1 Oesywpb4CLRJ735nsWkZhpskyixu/IxCSe+VOQMJRGJHGm8OkDM4aC4efb3bdsrq914R Z3XWS/SzkztHd5HMluIxq75U0vGUO0B0kgXBEU0kRDbRqa9HiydgzA+zCJuwfGLvCfaI xWlQ== X-Gm-Message-State: ALoCoQlE9SDiMJoqwvw+kfLN8p7sjUZPbCfYxJ0UsOMlXibSPY+b613zmxqO2rPfPzybHd4rpS2d X-Received: by 10.58.15.136 with SMTP id x8mr9283897vec.1.1405385886891; Mon, 14 Jul 2014 17:58:06 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id o69si857866yhp.6.2014.07.14.17.58.06 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Jul 2014 17:58:06 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id BA9EB31C1FE; Mon, 14 Jul 2014 17:58:06 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 8A4E0220B08; Mon, 14 Jul 2014 18:58:06 -0600 (MDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Mon, 14 Jul 2014 18:56:15 -0600 Message-Id: <1405385792-4469-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1405385792-4469-1-git-send-email-sjg@chromium.org> References: <1405385792-4469-1-git-send-email-sjg@chromium.org> Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com> Subject: [U-Boot] [PATCH 08/25] 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 5c92664..e0d42eb 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 also 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> --- common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)