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

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

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 68a0cfdf7f266afc847d6be6dbbf83a3da2686fe..9a649ca125fec2ca3682c93aa18ab1d35075ce00 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -63,16 +63,6 @@
 #define        CONFIG_8xx_CONS_SMC1
 #define CONFIG_BAUDRATE                        38400
 
-/*
- * Set allowable console baud rates
- */
-#define CONFIG_SYS_BAUDRATE_TABLE              { 9600,         \
-                                         19200,        \
-                                         38400,        \
-                                         57600,        \
-                                         115200,       \
-                                       }
-
 /*
  * Print console information
  */
@@ -105,11 +95,6 @@
 #undef CONFIG_LOADS_ECHO
 #define        CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/*
- * Set default load address for tftp network downloads
- */
-#define        CONFIG_SYS_TFTP_LOADADDR                                0x01000000
-
 /*
  * Turn off the watchdog timer
  */
@@ -292,7 +277,6 @@
  * Use the "hush" command parser
  */
 #define        CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 /*
  * Set buffer size for console I/O