aboutsummaryrefslogtreecommitdiff
path: root/board/mimc
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-02-23 10:34:39 +0100
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-02-23 10:34:39 +0100
commit156feb90d200f186cdfd856d7f6f1878bb1bec1e (patch)
treeeba5714fefee9dfcc0cc797ad0aeceaadc04c407 /board/mimc
parentea393eb1d6a786fc2e895f90abb5f7e7541aef45 (diff)
parenta69a42338dd25408f9fd5390a83bc501749c7e1b (diff)
downloadu-boot-linaro-stable-156feb90d200f186cdfd856d7f6f1878bb1bec1e.tar.gz
Merge branch 'mimc200' into next
Conflicts: board/mimc/mimc200/mimc200.c include/configs/mimc200.h
Diffstat (limited to 'board/mimc')
-rw-r--r--board/mimc/mimc200/mimc200.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c
index 1092cd036..ec83b9d4a 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);