* [U-Boot] [PATCH] Allow u-boot to be silent without forcing Linux to be
2013-02-08 20:17 [U-Boot] [PATCH] Allow u-boot to be silent without forcing Linux to be Joe Hershberger
@ 2013-02-09 2:29 ` Simon Glass
2013-02-11 10:30 ` Stefan Roese
2013-02-27 20:20 ` [U-Boot] [PATCH v2] " Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Simon Glass @ 2013-02-09 2:29 UTC (permalink / raw)
To: u-boot
Hi Joe,
On Fri, Feb 8, 2013 at 12:17 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> That's a bit presumptuous of you, u-boot!
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
> common/cmd_bootm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index 7ae5d5b..435c980 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -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.
> 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();
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Regards,
Simon
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] Allow u-boot to be silent without forcing Linux to be
2013-02-08 20:17 [U-Boot] [PATCH] Allow u-boot to be silent without forcing Linux to be Joe Hershberger
2013-02-09 2:29 ` Simon Glass
@ 2013-02-11 10:30 ` Stefan Roese
2013-02-27 20:20 ` [U-Boot] [PATCH v2] " Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Roese @ 2013-02-11 10:30 UTC (permalink / raw)
To: u-boot
Hi Joe,
On 02/08/2013 09:17 PM, Joe Hershberger wrote:
> That's a bit presumptuous of you, u-boot!
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
> common/cmd_bootm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index 7ae5d5b..435c980 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] Allow u-boot to be silent without forcing Linux to be
2013-02-08 20:17 [U-Boot] [PATCH] Allow u-boot to be silent without forcing Linux to be Joe Hershberger
2013-02-09 2:29 ` Simon Glass
2013-02-11 10:30 ` Stefan Roese
@ 2013-02-27 20:20 ` Joe Hershberger
2 siblings, 0 replies; 4+ messages in thread
From: Joe Hershberger @ 2013-02-27 20:20 UTC (permalink / raw)
To: u-boot
That's a bit presumptuous of you, u-boot!
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
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(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 7ae5d5b..435c980 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -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();
diff --git a/doc/README.silent b/doc/README.silent
index 70202ce..6d90a0e 100644
--- a/doc/README.silent
+++ b/doc/README.silent
@@ -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.
--
1.7.11.5
^ permalink raw reply related [flat|nested] 4+ messages in thread