Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 0082e71..334b7ec 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -138,9 +138,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      */
@@ -158,8 +155,6 @@
 
 #define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
@@ -475,7 +470,6 @@
                         MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 |   \
                         MAMR_RLFA_1X    | MAMR_WLFA_1X    | MAMR_TLFA_4X)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
 #define CONFIG_ETHPRIME                "SCC"