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

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

diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 9da318d..450c98b 100644 (file)
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -162,9 +162,6 @@
 #if 0
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
 #endif
-#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      */
@@ -182,8 +179,6 @@
 
 #define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_AUTO_COMPLETE   1       /* add autocompletion support   */
 
 /*
@@ -336,6 +331,7 @@
  *-----------------------------------------------------------------------
  */
 
+#define CONFIG_IDE_PREINIT     1       /* Use preinit IDE hook */
 #define        CONFIG_IDE_8xx_PCCARD   1       /* Use IDE with PC Card Adapter */
 
 #undef CONFIG_IDE_8xx_DIRECT           /* Direct IDE    not supported  */