[U-Boot] [PATCH 3/5] x86: qemu: Wrap E1000 driver only when DM_PCI is not used

Bin Meng bmeng.cn at gmail.com
Tue May 5 17:24:28 CEST 2015


E1000 driver has not been converted to driver model, so wrap it
only when DM_PCI is not used.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
---

 include/configs/qemu-x86.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 463620d..281aaa5 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -32,7 +32,9 @@
 #define CONFIG_PCI_IO_SIZE		0xe000
 
 #define CONFIG_PCI_PNP
+#ifndef CONFIG_DM_PCI
 #define CONFIG_E1000
+#endif
 
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=serial\0" \
-- 
1.8.2.1



More information about the U-Boot mailing list