Merge branch 'mimc200' into next

Conflicts:

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

diff --cc board/mimc/mimc200/mimc200.c
index 1092cd036da7c41061ce1dc25b3d405ddba6b059,fd497b2520db7bdf9ca1e13c3f96063ce949c977..ec83b9d4a957f7df5209bddd43d05c62a382e34a
--- 1/board/mimc/mimc200/mimc200.c
--- 2/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/mimc200/mimc200.c
@@@ -65,23 -71,23 +65,23 @@@ int board_early_init_f(void
  
        /* init custom i/o */
        /* cpu type inputs */
 -      gpio_select_pio(GPIO_PIN_PE19, 0);
 -      gpio_select_pio(GPIO_PIN_PE20, 0);
 -      gpio_select_pio(GPIO_PIN_PE23, 0);
 +      portmux_select_gpio(PORTMUX_PORT_E, (1 << 19) | (1 << 20) | (1 << 23),
 +                      PORTMUX_DIR_INPUT);
        /* main board type inputs */
 -      gpio_select_pio(GPIO_PIN_PB19, 0);
 -      gpio_select_pio(GPIO_PIN_PB29, 0);
 +      portmux_select_gpio(PORTMUX_PORT_B, (1 << 19) | (1 << 29),
 +                      PORTMUX_DIR_INPUT);
        /* DEBUG input (use weak pullup) */
 -      gpio_select_pio(GPIO_PIN_PE21, GPIOF_PULLUP);
 +      portmux_select_gpio(PORTMUX_PORT_E, 1 << 21,
 +                      PORTMUX_DIR_INPUT | PORTMUX_PULL_UP);
  
        /* are we suppressing the console ? */
 -      if (gpio_get_value(GPIO_PIN_PE21) == 1)
 +      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 */
 -      gpio_select_pio(GPIO_PIN_PE24, 0);
 -      gpio_set_value(GPIO_PIN_PC18, 1);       /* PHY RESET    */
 -      gpio_select_pio(GPIO_PIN_PC18, GPIOF_OUTPUT);
 +      portmux_select_gpio(PORTMUX_PORT_E, 1 << 24, PORTMUX_DIR_INPUT);
 +      portmux_select_gpio(PORTMUX_PORT_C, 1 << 18,
 +                      PORTMUX_DIR_OUTPUT | PORTMUX_INIT_HIGH);
  
        /* GCLK0 - 10MHz clock */
        writel(0x00000004, (void *)SM_BASE + SM_PM_GCCTRL);

diff --cc include/configs/mimc200.h
index 2eb9ebc29074920b08d590dcb2a57e098899e72c,0345b4af0570374cfe7213ffbdb4f72904f293d7..8ff2f8a21e1d92387c385abbbb9c3a5fbdc66216
--- 1/include/configs/mimc200.h
--- 2/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@@ -74,13 -74,13 +74,13 @@@
  
  #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 CFG_DEVICE_NULLDEV            1       /* include nulldev device */
 +#define CONFIG_SYS_DEVICE_NULLDEV             1       /* include nulldev device */
  
  /*
   * Only interrupt autoboot if <space> is pressed. Otherwise, garbage