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

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

diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 95ddc974e4b6425e8c02922936d0fbde13979886..7145cc444635a190be86b6d635cbfcadac022ff8 100644 (file)
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
 #define CONFIG_SYS_PROMPT      "=> "           /* Monitor Command Prompt       */
 #undef CONFIG_SYS_HUSH_PARSER                  /* Hush parse for U-Boot        */
-#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      */
 #else
@@ -279,6 +276,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  */