]> git.sur5r.net Git - u-boot/commitdiff
pci: Don't use pci_indirect when DM is active
authorMario Six <mario.six@gdsys.cc>
Fri, 27 Apr 2018 12:53:37 +0000 (14:53 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 8 May 2018 22:50:23 +0000 (18:50 -0400)
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>
drivers/pci/pci_indirect.c

index a24100e3a88b2462a5843f3b730988522200cafd..6134c22d1bccf0fe7810f07a68196865587d1491 100644 (file)
@@ -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>