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

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

diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index f933ea8de3864438abff8cd584132f57070f8907..0a9a1ff90c843e7de9c41fd62647a8e0ac963d64 100644 (file)
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -52,23 +52,20 @@
 
 #define CONFIG_BOOTDELAY       5
 
-#if 0
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL | \
-                                 CFG_CMD_BEDBUG | \
-                                 CFG_CMD_BSP    | \
-                                 CFG_CMD_ELF    | \
-                                 CFG_CMD_I2C    | \
-                                 CFG_CMD_FLASH | \
-                                 CFG_CMD_BEDBUG | \
-                                 CFG_CMD_NET    | \
-                                 CFG_CMD_PCI )
-#endif
 
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL )
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
 
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
 
 
 /*
@@ -106,7 +103,7 @@
 
 /* #define CONFIG_TULIP */
 /* #define CONFIG_EEPRO100 */
-#define CONFIG_NATSEMI  
+#define CONFIG_NATSEMI
 
 #define PCI_ENET0_IOADDR               0x80000000
 #define PCI_ENET0_MEMADDR              0x80000000
@@ -114,6 +111,8 @@
 #define PCI_ENET1_MEMADDR              0x81000000
 #define PCI_ENET2_IOADDR               0x82000000
 #define PCI_ENET2_MEMADDR              0x82000000
+#define PCI_ENET3_IOADDR               0x83000000
+#define PCI_ENET3_MEMADDR              0x83000000
 
 
 /*-----------------------------------------------------------------------
@@ -307,7 +306,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value        */
 #endif
 
@@ -319,6 +318,4 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
-
-
 #endif /* __CONFIG_H */