MIMC200 board now uses CONFIG_DISABLE_CONSOLE

Changed MIMC200 board setup and config to use CONFIG_DISABLE_CONSOLE.
Also fixed default uImage location.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c
index 8516dcb8288bf83b1183fbf5882613584c2e145b..fd497b2520db7bdf9ca1e13c3f96063ce949c977 100644 (file)
--- a/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/mimc200/mimc200.c
@@ -82,7 +82,7 @@ int board_early_init_f(void)
 
        /* are we suppressing the console ? */
        if (gpio_get_value(GPIO_PIN_PE21) == 1)
-               gd->flags |= GD_FLG_SILENT;
+               gd->flags |= (GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE);
 
        /* reset phys */
        gpio_select_pio(GPIO_PIN_PE24, 0);

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index da307aca2d855e0d196e9fa5b293a1594e6a588e..0345b4af0570374cfe7213ffbdb4f72904f293d7 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 CFG_DEVICE_NULLDEV             1       /* include nulldev device */
 
 /*