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

[platform/kernel/u-boot.git] / include / configs / M5271EVB.h

diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 3935f56..885a882 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -50,6 +50,8 @@
 
 #undef CONFIG_WATCHDOG         /* disable watchdog */
 
+#define CONFIG_BOOTDELAY       5
+
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
@@ -63,15 +65,31 @@
 #define CFG_ENV_IS_IN_FLASH    1
 #endif
 
-#define CONFIG_COMMANDS         ((CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET ) & ~(CFG_CMD_LOADS | CFG_CMD_LOADB))
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_NET
+
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_LOADB
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CFG_PROMPT             "=> "
 #define CFG_LONGHELP                           /* undef to save memory         */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE             1024            /* Console I/O Buffer Size      */
 #else
 #define CFG_CBSIZE             256             /* Console I/O Buffer Size      */