Merge with git://www.denx.de/git/u-boot.git

[oweals/u-boot.git] / include / configs / o2dnt.h

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 9ed1ed856c831435a0827e0ed5febbf34b38491e..f1d73e4c5396f1147e637e77d5af67302f611d42 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -68,8 +68,6 @@
 #define CFG_RX_ETH_BUFFER      8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
 
-#define ADD_PCI_CMD            CFG_CMD_PCI
-
 /* Partitions */
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -78,6 +76,15 @@
 #define CONFIG_TIMESTAMP       /* Print image info with timestamp */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -89,7 +96,7 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_PCI_CMD
+#define CONFIG_CMD_PCI
 
 
 #if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */