Merge branch 'mimc200' into next

[karo-tx-uboot.git] / include / configs / mimc200.h

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 2eb9ebc29074920b08d590dcb2a57e098899e72c..8ff2f8a21e1d92387c385abbbb9c3a5fbdc66216 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -74,12 +74,12 @@
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTARGS                                                        \
-       "console=ttyS0 root=/dev/mtdblock1 fbmem=600k rootfstype=jffs2"
+       "root=/dev/mtdblock1 rootfstype=jffs2 console=ttyS1"
 #define CONFIG_BOOTCOMMAND                                             \
-       "fsload; bootm"
+       "fsload boot/uImage; bootm"
 
 #define CONFIG_SILENT_CONSOLE          1       /* enable silent startup */
-#define CONFIG_SILENT_CONSOLE_INPUT    1       /* disable console inputs */
+#define CONFIG_DISABLE_CONSOLE         1       /* disable console */
 #define CONFIG_SYS_DEVICE_NULLDEV              1       /* include nulldev device */
 
 /*