Merge branch 'mimc200' into next

Conflicts:

	board/mimc/mimc200/mimc200.c
	include/configs/mimc200.h

diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c
index 1092cd036da7c41061ce1dc25b3d405ddba6b059..ec83b9d4a957f7df5209bddd43d05c62a382e34a 100644 (file)
--- a/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/mimc200/mimc200.c
@@ -76,7 +76,7 @@ int board_early_init_f(void)
 
        /* are we suppressing the console ? */
        if (gpio_get_value(GPIO_PIN_PE(21)) == 1)
-               gd->flags |= GD_FLG_SILENT;
+               gd->flags |= (GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE);
 
        /* reset phys */
        portmux_select_gpio(PORTMUX_PORT_E, 1 << 24, PORTMUX_DIR_INPUT);

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 */
 
 /*