Patchwork [U-Boot] Allow u-boot to be silent without forcing Linux to be

login
register
mail settings
Submitter Joe Hershberger
Date Feb. 8, 2013, 8:17 p.m.
Message ID <1360354624-605-1-git-send-email-joe.hershberger@ni.com>
Download mbox | patch
Permalink /patch/219296/
State Changes Requested
Delegated to: Tom Rini
Headers show

Comments

Joe Hershberger - Feb. 8, 2013, 8:17 p.m.
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(-)
Simon Glass - Feb. 9, 2013, 2:29 a.m.
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@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

Regards,
Simon
Stefan Roese - Feb. 11, 2013, 10:30 a.m.
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

Patch

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();