diff mbox series

spl: Avoid printing boot device if silent console is enabled

Message ID 20200903172515.185232-1-otavio@ossystems.com.br
State Accepted
Delegated to: Tom Rini
Headers show
Series spl: Avoid printing boot device if silent console is enabled | expand

Commit Message

Otavio Salvador Sept. 3, 2020, 5:25 p.m. UTC 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

 common/spl/spl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Tom Rini Sept. 3, 2020, 6:10 p.m. UTC | #1 
On Thu, Sep 03, 2020 at 02:25:15PM -0300, Otavio Salvador wrote:

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Reviewed-by: Tom Rini <trini@konsulko.com>
Stefan Roese Sept. 4, 2020, 4:47 a.m. UTC | #2 
On 03.09.20 19:25, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
>   common/spl/spl.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index 4840d1d367..63c48fbf33 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -552,7 +552,9 @@ static int boot_from_devices(struct spl_image_info *spl_image,
>   		struct spl_image_loader *loader;
>   
>   		loader = spl_ll_find_loader(spl_boot_list[i]);
> -#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
> +#if defined(CONFIG_SPL_SERIAL_SUPPORT) \
> +    && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)    \
> +    && !defined(CONFIG_SILENT_CONSOLE)

Nitpicking:
I think its preferred to put the "&&" (or "||") at the end of the line.

Other than that:

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
Tom Rini Oct. 14, 2020, 5:42 p.m. UTC | #3 
On Thu, Sep 03, 2020 at 02:25:15PM -0300, Otavio Salvador wrote:

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Stefan Roese <sr@denx.de>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4840d1d367..63c48fbf33 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -552,7 +552,9 @@  static int boot_from_devices(struct spl_image_info *spl_image,
 		struct spl_image_loader *loader;
 
 		loader = spl_ll_find_loader(spl_boot_list[i]);
-#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
+#if defined(CONFIG_SPL_SERIAL_SUPPORT) \
+    && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)    \
+    && !defined(CONFIG_SILENT_CONSOLE)
 		if (loader)
 			printf("Trying to boot from %s\n", loader->name);
 		else