diff options
author | Mark Jackson <mpfj@mimc.co.uk> | 2008-10-03 11:48:57 +0100 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-05 21:43:49 +0200 |
commit | a69a42338dd25408f9fd5390a83bc501749c7e1b (patch) | |
tree | 976bf2c30d4ecca611a06c18126441ec5ad0cc33 | |
parent | 8fd4166c467a46773f80208bda1ec3b4757747bc (diff) | |
download | u-boot-imx-a69a42338dd25408f9fd5390a83bc501749c7e1b.zip u-boot-imx-a69a42338dd25408f9fd5390a83bc501749c7e1b.tar.gz u-boot-imx-a69a42338dd25408f9fd5390a83bc501749c7e1b.tar.bz2 |
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>
-rw-r--r-- | board/mimc/mimc200/mimc200.c | 2 | ||||
-rw-r--r-- | include/configs/mimc200.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c index 8516dcb..fd497b2 100644 --- 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 da307ac..0345b4a 100644 --- 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 */ /* |