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

[u-boot] / include / configs / cogent_mpc8260.h

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index ac1baf3b4e53383c699529f1cd6ee050d95ff258..84d50c71dd5f6f10ad65859cf445252fc5a85ac9 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -71,8 +71,7 @@
  * for FCC)
  *
  * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
- * defined elsewhere (as for the console), or CFG_CMD_NET must be removed
- * from CONFIG_COMMANDS to remove support for networking.
+ * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.
  */
 #undef CONFIG_ETHER_ON_SCC             /* define if ether on SCC       */
 #undef CONFIG_ETHER_ON_FCC             /* define if ether on FCC       */
@@ -89,6 +88,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */