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

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

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 86a16e7..605755a 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -55,21 +55,33 @@
 #define CONFIG_PHY_RESET       1
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL |       \
-                                CFG_CMD_ASKENV |       \
-                                CFG_CMD_CACHE  |       \
-                                CFG_CMD_DHCP   |       \
-                                CFG_CMD_DIAG   |       \
-                                CFG_CMD_EEPROM |       \
-                                CFG_CMD_ELF    |       \
-                                CFG_CMD_I2C    |       \
-                                CFG_CMD_IRQ    |       \
-                                CFG_CMD_LOG    |       \
-                                CFG_CMD_MII    |       \
-                                CFG_CMD_NET    |       \
-                                CFG_CMD_NFS    |       \
-                                CFG_CMD_PING   |       \
-                                CFG_CMD_REGINFO)
+/*
+ * 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_ASKENV
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_LOG
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_REGINFO
 
 /* POST support */
 #define CONFIG_POST            (CFG_POST_MEMORY   | \
@@ -88,9 +100,6 @@
 
 #define CFG_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
 /*-----------------------------------------------------------------------
@@ -126,7 +135,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_LONGHELP                   /* undef to save memory         */
 #define CFG_PROMPT             "=> "   /* Monitor Command Prompt       */
-#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      */
@@ -232,9 +241,7 @@
  */
 #define CFG_DCACHE_SIZE                16384   /* For IBM 405EP CPU                    */
 #define CFG_CACHELINE_SIZE     32      /* ...                  */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value        */
-#endif
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in data cache)
@@ -304,7 +311,7 @@
 #define BOOTFLAG_COLD          0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM          0x02            /* Software reboot                      */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400          /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */
 #endif