[U-Boot] [PATCH 1/3] pci: Don't use pci_indirect when DM is active

Mario Six mario.six at gdsys.cc
Wed Mar 28 12:40:10 UTC 2018


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 at gdsys.cc>
---
 drivers/pci/pci_indirect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index 4a36749aa4..2db73f92de 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -8,7 +8,7 @@
 
 #include <common.h>
 
-#if !defined(__I386__)
+#if !defined(__I386__) && !defined(CONFIG_DM_PCI)
 
 #include <asm/processor.h>
 #include <asm/io.h>
-- 
2.16.1



More information about the U-Boot mailing list