minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 13:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow u-boot to be silent without forcing Linux to be

Browse Source 
That's a bit presumptuous of you, u-boot!

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2013-02-27 10:20:59 +00:00 committed by Tom Rini
parent 5501153917
commit be2e5a09e6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/cmd_bootm.c
View File

@ -88,7 +88,7 @@ static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
#include <linux/err.h> #include <linux/err.h>
#include <nand.h> #include <nand.h>
#ifdef CONFIG_SILENT_CONSOLE #if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
static void fixup_silent_linux(void); static void fixup_silent_linux(void);
#endif #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);
#ifdef CONFIG_SILENT_CONSOLE #if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
if (images.os.os == IH_OS_LINUX) if (images.os.os == IH_OS_LINUX)
fixup_silent_linux(); fixup_silent_linux();
#endif #endif
@ -1413,7 +1413,7 @@ U_BOOT_CMD(
/*******************************************************************/ /*******************************************************************/
/* helper routines */ /* helper routines */
/*******************************************************************/ /*******************************************************************/
#ifdef CONFIG_SILENT_CONSOLE #if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
static void fixup_silent_linux(void) static void fixup_silent_linux(void)
{ {
char buf[256], *start, *end; 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(); usb_stop();
#endif #endif
#ifdef CONFIG_SILENT_CONSOLE #if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
fixup_silent_linux(); fixup_silent_linux();
#endif #endif
arch_preboot_os(); arch_preboot_os();

4
doc/README.silent
View File

@ -23,4 +23,6 @@ The following actions are taken if "silent" is set at boot time:
- When booting a linux kernel, the "bootargs" are fixed up so that - When booting a linux kernel, the "bootargs" are fixed up so that
the argument "console=" will be in the command line, no matter how the argument "console=" will be in the command line, no matter how
it was set in "bootargs" before. it was set in "bootargs" before. If you don't want the linux command
line to be affected, define CONFIG_SILENT_U_BOOT_ONLY in your board
config file as well, and this part of the feature will be disabled.