Allow u-boot to be silent without forcing Linux to be
PATCH 1/1 Allow u-boot to be silent without forcing Linux to be
That's a bit presumptuous of you, u-boot!
--- common/cmd_bootm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
common/cmd_bootm.c +4 -4
@@ -83,7 +83,7 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */static int do_imls (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )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 ); -#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
@@ -1258,7 +1258,7 @@ U_BOOT_CMD(/*******************************************************************/ /* helper routines */ /*******************************************************************/ -#ifdef 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;
@@ -1651,7 +1651,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])usb_stop ();#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )fixup_silent_linux ();#endif arch_preboot_os ();
Signature · 1 line
1.7.11.5
PATCH 1/1 Allow u-boot to be silent without forcing Linux to be
Hi Joe,
Quoted 12 lines · Joe Hershberger
That's a bit presumptuous of you, u-boot!
Signed-off-by Joe Hershberger <[email protected]>--- common/cmd_bootm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)common/cmd_bootm.c +0
-0
common/cmd_bootm.c extern flash_info_t flash_info[]; /* info for FLASH chips */ · line 86
Quoted 5 lines
common/cmd_bootm.c +1
-1@@ -83,7 +83,7 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */static int do_imls (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )
If you are adding a new config I think it should go in the README.
Quoted 33 lines
common/cmd_bootm.c +3
-4static 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 ); -#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 @@ -1258,7 +1258,7 @@ U_BOOT_CMD(/*******************************************************************/ /* helper routines */ /*******************************************************************/ -#ifdef 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;@@ -1651,7 +1651,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])usb_stop ();#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )fixup_silent_linux ();#endif arch_preboot_os (); --1.7.11.5
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Regards,
Simon
PATCH 1/1 Allow u-boot to be silent without forcing Linux to be
In reply to Joe HershbergerHi Joe,
Quoted 12 lines · Joe Hershberger
That's a bit presumptuous of you, u-boot!
Signed-off-by Joe Hershberger <[email protected]>--- common/cmd_bootm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)common/cmd_bootm.c +0
-0
common/cmd_bootm.c extern flash_info_t flash_info[]; /* info for FLASH chips */ · line 86
Quoted 5 lines
common/cmd_bootm.c +1
-1@@ -83,7 +83,7 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */static int do_imls (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )
Could you please add a short description of this new define to the README?
Thanks,
Stefan
PATCH v2 1/1 Allow u-boot to be silent without forcing Linux to be
In reply to Joe HershbergerThat's a bit presumptuous of you, u-boot!
---
Changes in v2:
- Added info about the change to README.silent
common/cmd_bootm.c | 8 ++++---- doc/README.silent | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-)
common/cmd_bootm.c +4 -4
@@ -83,7 +83,7 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */static int do_imls (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )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 ); -#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
@@ -1258,7 +1258,7 @@ U_BOOT_CMD(/*******************************************************************/ /* helper routines */ /*******************************************************************/ -#ifdef 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;
@@ -1651,7 +1651,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])usb_stop ();#endif -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE ) && !defined(CONFIG_SILENT_U_BOOT_ONLY )fixup_silent_linux ();#endif arch_preboot_os ();
doc/README.silent +3 -1
@@ -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 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.
Signature · 1 line
1.7.11.5