[U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

[Allen Martin]

On Tue, Jan 22, 2013 at 06:12:47AM -0800, Simon Glass wrote:
> On Tue, Jan 22, 2013 at 2:15 AM, Lucas Stach <dev at lynxeye.de> wrote:
> > No one expects to end up in a delayed environment if
> > CONFIG_DELAY_ENVIRONMENT isn't defined.
> >
> > Signed-off-by: Lucas Stach <dev at lynxeye.de>
> 
> Good with me, and solves the immediate problem. Thanks for doing the patch.
> 
> Acked-by: Simon Glass <sjg at chromium.org>
> 

Adding Tom Rini and Albert.  What's the best way to get this up to
u-boot/master as quickly as possible?  Environment is broken on all
boards that use fdt until this goes in.

-Allen

> > ---
> > v2: keep preference of CONFIG_OF_CONTROL and just change default value
> > ---
> >  arch/arm/lib/board.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
> > index cfe32cc..9f861cc 100644
> > --- a/arch/arm/lib/board.c
> > +++ b/arch/arm/lib/board.c
> > @@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
> >  static int should_load_env(void)
> >  {
> >  #ifdef CONFIG_OF_CONTROL
> > -       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
> > +       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
> >  #elif defined CONFIG_DELAY_ENVIRONMENT
> >         return 0;
> >  #else
> > --
> > 1.8.0.2
> >
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

-- 
nvpublic