From: Paul B. Henson <henson@acm.org>
Date: Sun, 4 Aug 2013 04:29:09 +0000 (-0700)
Subject: bootm: fix conditional controlling call to fixup_silent_linux
X-Git-Tag: v2013.10-rc1~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd4a3997f1869113b7ff5881d507b5baab557a6e;p=u-boot

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>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 31ec0f4bbc..1685c14a52 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