[U-Boot] [PATCH] bootm: fix conditional controlling call to fixup_silent_linux

[Simon Glass]

Hi Paul,

On Sun, Aug 4, 2013 at 1:59 PM, Paul B. Henson <henson at acm.org> wrote:

> Looks like this was broken in commit
> 35fc84fa1ff51e15ecd3e464dac87eb105ffed30,
> the refactor changed the conditional test when the code was moved.
>
>
This looks right.

Acked-by: Simon Glass <sjg at chromium.org>

But which board does it actually break, please?


> On Sat, Aug 03, 2013 at 09:29:09PM -0700, Paul B. Henson wrote:
> > This function is only defined if CONFIG_SILENT_CONSOLE is set and
> > CONFIG_SILENT_U_BOOT_ONLY is not set, the call to it should be based
> > on the same conditions.
> >
> > Signed-off-by: Paul B. Henson <henson at acm.org>
> > ---
> >  common/cmd_bootm.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> > index 046e22f..691d16b 100644
> > --- a/common/cmd_bootm.c
> > +++ b/common/cmd_bootm.c
> > @@ -636,7 +636,7 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int
> flag, int argc,
> >                       goto err;
> >               else if (ret == BOOTM_ERR_OVERLAP)
> >                       ret = 0;
> > -#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
> > --
> > 1.7.8.6
>

Regards,
Simon