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

[u-boot] / include / configs / TQM8260.h

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 626cf19bd0ff634c786b3b374053683029c8f8d4..7e241317960c4a3f865644cee82953735c2201cf 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -248,9 +248,6 @@
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define        CONFIG_SYS_CBSIZE       1024            /* Console I/O Buffer Size      */
@@ -268,8 +265,6 @@
 
 #define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define        CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC     /* "bad" address                */
 
 /*