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

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

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 109ed3d811e286e7ad94792e9f0c01d9599b34fd..9370c24c500ec7040e05c3b72be387f792431776 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -58,14 +58,31 @@
 #endif
 #define CONFIG_BOOTARGS      "console=ttyS0 root=/dev/nfs rw nfsroot=209.128.93.133:/boot nfsaddrs=209.128.93.133:209.128.93.138"
 #define CONFIG_BOOTDELAY     3
-#define CONFIG_COMMANDS      (CONFIG_CMD_DFL|CFG_CMD_ASKENV|CFG_CMD_DATE)
+
+
+/*
+ * 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_DATE
+
+
 #define CONFIG_ENV_OVERWRITE 1
 #define CONFIG_ETH_ADDR      "00:10:18:10:00:06"
 
 #define CONFIG_DOS_PARTITION  1 /* MSDOS bootable partitiion support */
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
- */
-#include <cmd_confdefs.h>
+
 #include "../board/mousse/mousse.h"
 
 /*
@@ -229,7 +246,7 @@
 
 
 #define CFG_PGMAX           0x32 /* how long the 8240 reatins the currently accessed page in memory
-                                    see 8240 book for details*/
+                                   see 8240 book for details*/
 #define PCI_MEM_SPACE1_START   0x80000000
 #define PCI_MEM_SPACE2_START   0xfd000000
 
@@ -296,7 +313,6 @@
 #define CFG_CACHELINE_SIZE  16
 
 
-
 /*
  * Internal Definitions
  *
@@ -328,5 +344,3 @@
 #define CONFIG_TULIP
 
 #endif  /* __CONFIG_H */
-
-