]> git.sur5r.net Git - u-boot/commitdiff
bootm: fix conditional controlling call to fixup_silent_linux
authorPaul B. Henson <henson@acm.org>
Sun, 4 Aug 2013 04:29:09 +0000 (21:29 -0700)
committerTom Rini <trini@ti.com>
Fri, 16 Aug 2013 17:45:15 +0000 (13:45 -0400)
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>
common/cmd_bootm.c

index 31ec0f4bbcd5aa8a0435da7c8c55553456db9391..1685c14a5261eba30d21ea29c9eb87a65fbe50e5 100644 (file)
@@ -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