summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPaul B. Henson <henson@acm.org>2013-08-03 21:29:09 -0700
committerTom Rini <trini@ti.com>2013-08-16 13:45:15 -0400
commitbd4a3997f1869113b7ff5881d507b5baab557a6e (patch)
tree52c710b07fec817a0209193265c60f223ec61e5d /common
parent8d51aacd8cd99adb9e58933951602c4f43e90aa1 (diff)
downloadu-boot-imx-bd4a3997f1869113b7ff5881d507b5baab557a6e.zip
u-boot-imx-bd4a3997f1869113b7ff5881d507b5baab557a6e.tar.gz
u-boot-imx-bd4a3997f1869113b7ff5881d507b5baab557a6e.tar.bz2
bootm: fix conditional controlling call to fixup_silent_linux
This function is only defined if CONFIG_SILENT_CONSOLE is set and CONFIG_SILENT_U_BOOT_ONLY is not set, the call to it should be based on the same conditions. Signed-off-by: Paul B. Henson <henson@acm.org> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 31ec0f4..1685c14 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -636,7 +636,7 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc,
goto err;
else if (ret == BOOTM_ERR_OVERLAP)
ret = 0;
-#ifdef CONFIG_SILENT_CONSOLE
+#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
if (images->os.os == IH_OS_LINUX)
fixup_silent_linux();
#endif