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

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 4d648c8..cdd5c79 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -48,7 +48,6 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
@@ -73,13 +72,7 @@
  * Autobooting
  */
 #define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR       "\x1b\x1b"
-#define DEBUG_BOOTKEYS         0
-#undef CONFIG_AUTOBOOT_DELAY_STR
 #undef CONFIG_BOOTARGS
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, "           \
-                               "press \"<Esc><Esc>\" to stop\n", bootdelay
 
 #define CONFIG_CMDLINE_EDITING         1       /* add command line history     */
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */