diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:34:39 +0100 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:34:39 +0100 |
commit | 156feb90d200f186cdfd856d7f6f1878bb1bec1e (patch) | |
tree | eba5714fefee9dfcc0cc797ad0aeceaadc04c407 | |
parent | ea393eb1d6a786fc2e895f90abb5f7e7541aef45 (diff) | |
parent | a69a42338dd25408f9fd5390a83bc501749c7e1b (diff) |
Merge branch 'mimc200' into next
Conflicts:
board/mimc/mimc200/mimc200.c
include/configs/mimc200.h
-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 1092cd036d..ec83b9d4a9 100644 --- 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 2eb9ebc290..8ff2f8a21e 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 CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ /* |