Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 0615117..40c8d71 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -63,10 +63,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_IMLS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 
@@ -125,7 +122,6 @@
 
 #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
 
 /*
@@ -134,6 +130,7 @@
 #define CONFIG_SYS_HUSH_PARSER         1
 
 #define CONFIG_SYS_LONGHELP                            /* undef to save memory         */
+#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT              "$ "            /* Monitor Command Prompt */
 #else