summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-27 12:56:01 +0200
committerWolfgang Denk <wd@denx.de>2008-05-27 12:56:01 +0200
commit1f1554841a4c8e069d331176f0c3059fb2bb8280 (patch)
tree43a492b3f604adedc0ccc3a6432549681375b64f /include
parent791e1dba8de76ad8e762a7badb869f224a1f8b82 (diff)
parentc918261c6d9f265f88baf70f8a73dfe6f0cb9596 (diff)
downloadu-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.zip
u-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.tar.gz
u-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/socrates.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 00c0dab..23ed87f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -237,7 +237,13 @@
#if defined(CONFIG_PCI)
#define CONFIG_PCI_PNP /* do pci plug-and-play */
+
+#define CONFIG_EEPRO100
+#undef CONFIG_TULIP
+
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
+#define CFG_PCI_SUBSYS_VENDORID 0x1057 /* Motorola */
+
#endif /* CONFIG_PCI */