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

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

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index ecb7215e2e6049be612d16c5f99f9e53540c4d95..c67b30122761b18183afdef51d5cd916eb409824 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -36,18 +36,24 @@
 
 
 /*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
- * neccessary in include/cmd_confdefs.h file. (Un)comment for getting
- * functionality or size of u-boot code.
+ * BOOTP options
  */
-#define CONFIG_COMMANDS         (CONFIG_CMD_DFL                \
-                               & ~CFG_CMD_NET          \
-                               & ~CFG_CMD_LOADS        \
-                               & ~CFG_CMD_CONSOLE      \
-                               & ~CFG_CMD_AUTOSCRIPT   \
-/*                             | CFG_CMD_JFFS2 */      \
-                               )
-#include <cmd_confdefs.h>
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_CONSOLE
+#undef CONFIG_CMD_AUTOSCRIPT
+
 
 /*
  * Boot options. Setting delay to -1 stops autostart count down.
@@ -93,6 +99,7 @@
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 #define CFG_MALLOC_LEN   (CFG_ENV_SIZE + (128<<10) )
+#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */
 
@@ -151,7 +158,7 @@
  * Right now there is no gain for user, but later on booting kernel might be
  * possible. Consider using XIP kernel running from flash to save RAM
  * footprint.
- * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
+ * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
  */
 #define CFG_JFFS2_FIRST_BANK           0
 #define CFG_JFFS2_FIRST_SECTOR         5