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

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

diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 9779449bc6ac15b3cbc2b41717d9b519c1362109..07e8a4908d93ba513e972ac950ac35fb0ee32fdb 100644 (file)
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -112,7 +112,6 @@
  * "ethaddr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options
@@ -138,7 +137,6 @@
 
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "~> "
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_ATMEL_USART
@@ -192,7 +190,6 @@
 
 #define CONFIG_SYS_MEMTEST_START       EBI_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x700000)
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 38400, 19200, 9600, 2400 }
 
 #endif /* __GRASSHOPPER_CONFIG_H */
 /* vim: set ts=8 noet: */