projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
common
/
cmd_bootm.c
diff --git
a/common/cmd_bootm.c
b/common/cmd_bootm.c
index 2e9335207c5c11fb8d781c3ecf55b0d968c5b1b4..5d2ce0015ac3f30f1efa4901d9dfef20425ddec7 100644
(file)
--- a/
common/cmd_bootm.c
+++ b/
common/cmd_bootm.c
@@
-88,7
+88,7
@@
static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
#include <linux/err.h>
#include <nand.h>
#include <linux/err.h>
#include <nand.h>
-#if
def CONFIG_SILENT_CONSOLE
+#if
defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
static void fixup_silent_linux(void);
#endif
static void fixup_silent_linux(void);
#endif
@@
-694,7
+694,7
@@
int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
bootstage_mark(BOOTSTAGE_ID_CHECK_BOOT_OS);
bootstage_mark(BOOTSTAGE_ID_CHECK_BOOT_OS);
-#if
def 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
if (images.os.os == IH_OS_LINUX)
fixup_silent_linux();
#endif
@@
-1413,7
+1413,7
@@
U_BOOT_CMD(
/*******************************************************************/
/* helper routines */
/*******************************************************************/
/*******************************************************************/
/* helper routines */
/*******************************************************************/
-#if
def CONFIG_SILENT_CONSOLE
+#if
defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
static void fixup_silent_linux(void)
{
char buf[256], *start, *end;
static void fixup_silent_linux(void)
{
char buf[256], *start, *end;
@@
-1806,7
+1806,7
@@
static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
usb_stop();
#endif
usb_stop();
#endif
-#if
def CONFIG_SILENT_CONSOLE
+#if
defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
fixup_silent_linux();
#endif
arch_preboot_os();
fixup_silent_linux();
#endif
arch_preboot_os();