Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / MCR3000.h

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 17090da796e648928cb406d03ba2f3aa6a84ea0c..6b03873ce878debf7147683429e42d1d64c61417 100644 (file)
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -62,10 +62,6 @@
 #define CONFIG_NETMASK                 255.0.0.0
 
 #define CONFIG_BOOTCOMMAND             "run flashboot"
-#define CONFIG_BOOTARGS                "ubi.mtd=4 root=ubi0:rootfs rw "        \
-                               "rootfstype=ubifs rootflags=sync "      \
-                               "console=ttyCPM0,115200N8 "             \
-                               "ip=${ipaddr}:::${netmask}:mcr3k:eth0:off"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #undef CONFIG_LOADS_BAUD_CHANGE        /* don't allow baudrate change  */
@@ -73,13 +69,7 @@
 #define CONFIG_WATCHDOG                1       /* watchdog enabled */
 
 /* Miscellaneous configurable options */
-#define        CONFIG_SYS_LONGHELP
-#define        CONFIG_SYS_CBSIZE               256
-#define        CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define        CONFIG_SYS_MAXARGS              16
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_CMDLINE_EDITING         1
 #ifdef CONFIG_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT_HUSH_PS2      "S3K> "
 #endif
@@ -151,7 +141,4 @@
 #define        BOOTFLAG_COLD                   0x01
 #define BOOTFLAG_WARM                  0x02
 
-/* Misc Settings */
-#define CONFIG_CMD_REGINFO
-
 #endif /* __CONFIG_H */