[U-Boot,8/9] board_r: fix build with DM_SPI

Message ID	1b3e05a3598789479ee40423524f04bcb4b9d540.1541455253.git.christophe.leroy@c-s.fr
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> Message-Id: <1b3e05a3598789479ee40423524f04bcb4b9d540.1541455253.git.christophe.leroy@c-s.fr> In-Reply-To: <06f77f529e91ca377c0335a74554d2b6b36dbaa6.1541455253.git.christophe.leroy@c-s.fr> References: <06f77f529e91ca377c0335a74554d2b6b36dbaa6.1541455253.git.christophe.leroy@c-s.fr> From: Christophe Leroy <christophe.leroy@c-s.fr> MIME-Version: 1.0 To: Jagan Teki <jagan@amarulasolutions.com> Date: Tue, 6 Nov 2018 11:25:49 +0000 (UTC) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 8/9] board_r: fix build with DM_SPI Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[U-Boot,1/9] powerpc, mpc8xx: clear top of stack \| expand [U-Boot,1/9] powerpc, mpc8xx: clear top of stack [U-Boot,2/9] board: MCR3000: Activate CONFIG_DM and CONFIG_OF_CONTROL [U-Boot,3/9] drivers: watchdog: add a DM driver for the MPC8xx watchdog [U-Boot,4/9] board: MCR3000: use new DM watchdog [U-Boot,5/9] drivers: serial: migrate mpc8xx to DM [U-Boot,6/9] board: MCR3000: migrate to DM_SERIAL [U-Boot,7/9] drivers: serial: get rid of non DM mpc8xx driver [U-Boot,8/9] board_r: fix build with DM_SPI [U-Boot,9/9] spi, mpc8xx: migrate to DM_SPI

Message ID

1b3e05a3598789479ee40423524f04bcb4b9d540.1541455253.git.christophe.leroy@c-s.fr

State

Changes Requested

Delegated to:

Tom Rini

Headers

Message-Id: <1b3e05a3598789479ee40423524f04bcb4b9d540.1541455253.git.christophe.leroy@c-s.fr>
In-Reply-To: <06f77f529e91ca377c0335a74554d2b6b36dbaa6.1541455253.git.christophe.leroy@c-s.fr>
References: <06f77f529e91ca377c0335a74554d2b6b36dbaa6.1541455253.git.christophe.leroy@c-s.fr>
From: Christophe Leroy <christophe.leroy@c-s.fr>
MIME-Version: 1.0
To: Jagan Teki <jagan@amarulasolutions.com>
Date: Tue,  6 Nov 2018 11:25:49 +0000 (UTC)
Cc: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 8/9] board_r: fix build with DM_SPI
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

[U-Boot,1/9] powerpc, mpc8xx: clear top of stack | expand

Commit Message

Christophe Leroy Nov. 6, 2018, 11:25 a.m. UTC

CC      common/board_r.o
common/board_r.c:747:2: error: ‘initr_spi’ undeclared here (not in a function)
  initr_spi,
  ^
make[1]: *** [common/board_r.o] Error 1

Fixes: ebe76a2df9f6 ("dm: Remove spi_init() from board_r.c when using driver model")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 common/board_r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/board_r.c b/common/board_r.c
index c55e33eec27..0c2129b8ceb 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -743,7 +743,7 @@  static init_fnc_t init_sequence_r[] = {
 	/* initialize higher level parts of CPU like time base and timers */
 	cpu_init_r,
 #endif
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
 	initr_spi,
 #endif
 #ifdef CONFIG_CMD_NAND

[U-Boot,8/9] board_r: fix build with DM_SPI

Commit Message

Patch