From: Mario Six <mario.six@gdsys.cc>
Date: Fri, 27 Apr 2018 12:53:37 +0000 (+0200)
Subject: pci: Don't use pci_indirect when DM is active
X-Git-Tag: v2018.07-rc1~184
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e097ce4304056452704f54245e28a6badb59fe06;p=oweals%2Fu-boot.git

pci: Don't use pci_indirect when DM is active

Declaration of indirect PCI bridges is not compatible with DM: Both
define PCI operations, but in different ways. Hence, don't use indirect
bridges if DM is active.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index a24100e3a8..6134c22d1b 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 
-#if !defined(__I386__)
+#if !defined(__I386__) && !defined(CONFIG_DM_PCI)
 
 #include <asm/processor.h>
 #include <asm/io.h>