From: Christophe Leroy <christophe.leroy@c-s.fr>
Date: Wed, 21 Nov 2018 08:51:55 +0000 (+0000)
Subject: board_r: fix build with DM_SPI
X-Git-Tag: v2019.01-rc1~11^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1cd921b7552114293e2490aaca2a667f9d1c723;p=oweals%2Fu-boot.git

board_r: fix build with DM_SPI

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>
---

diff --git a/common/board_r.c b/common/board_r.c
index c55e33eec2..0c2129b8ce 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