From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Date: Mon, 22 Apr 2019 13:50:34 +0000 (+0800)
Subject: powerpc: mpc85xx: Update the condition to compile PCI routines
X-Git-Tag: v2019.07~23^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82c47a21e7ff3a2374328f75f4441ca750426d5b;p=oweals%2Fu-boot.git

powerpc: mpc85xx: Update the condition to compile PCI routines

Compile the routines of mpc85xx/pci.c when both FSL_PCI_INIT
and DM_PCI are not enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
---

diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 90ccc3427c..1d0213a513 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -12,7 +12,7 @@
 #include <asm/cpm_85xx.h>
 #include <pci.h>
 
-#if !defined(CONFIG_FSL_PCI_INIT)
+#if !defined(CONFIG_FSL_PCI_INIT) && !defined(CONFIG_DM_PCI)
 
 #ifndef CONFIG_SYS_PCI1_MEM_BUS
 #define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_BASE