* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
@ 2013-01-22 10:15 Lucas Stach
2013-01-22 14:12 ` Simon Glass
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Lucas Stach @ 2013-01-22 10:15 UTC (permalink / raw)
To: u-boot
No one expects to end up in a delayed environment if
CONFIG_DELAY_ENVIRONMENT isn't defined.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-22 10:15 [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Lucas Stach
@ 2013-01-22 14:12 ` Simon Glass
2013-01-30 23:04 ` Allen Martin
2013-01-30 18:25 ` Allen Martin
2013-01-31 0:33 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 1 reply; 7+ messages in thread
From: Simon Glass @ 2013-01-22 14:12 UTC (permalink / raw)
To: u-boot
On Tue, Jan 22, 2013 at 2:15 AM, Lucas Stach <dev@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@lynxeye.de>
Good with me, and solves the immediate problem. Thanks for doing the patch.
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-22 14:12 ` Simon Glass
@ 2013-01-30 23:04 ` Allen Martin
2013-01-31 0:31 ` Tom Rini
0 siblings, 1 reply; 7+ messages in thread
From: Allen Martin @ 2013-01-30 23:04 UTC (permalink / raw)
To: u-boot
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@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@lynxeye.de>
>
> Good with me, and solves the immediate problem. Thanks for doing the patch.
>
> Acked-by: Simon Glass <sjg@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
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-30 23:04 ` Allen Martin
@ 2013-01-31 0:31 ` Tom Rini
2013-01-31 0:34 ` Allen Martin
0 siblings, 1 reply; 7+ messages in thread
From: Tom Rini @ 2013-01-31 0:31 UTC (permalink / raw)
To: u-boot
On Wed, Jan 30, 2013 at 03:04:53PM -0800, Allen Martin wrote:
> 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@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@lynxeye.de>
> >
> > Good with me, and solves the immediate problem. Thanks for doing the patch.
> >
> > Acked-by: Simon Glass <sjg@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.
I can just grab this directly since everyone is happy. now.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130130/79250526/attachment-0001.pgp>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-31 0:31 ` Tom Rini
@ 2013-01-31 0:34 ` Allen Martin
0 siblings, 0 replies; 7+ messages in thread
From: Allen Martin @ 2013-01-31 0:34 UTC (permalink / raw)
To: u-boot
On Wed, Jan 30, 2013 at 04:31:42PM -0800, Tom Rini wrote:
> * PGP Signed by an unknown key
>
> On Wed, Jan 30, 2013 at 03:04:53PM -0800, Allen Martin wrote:
> > 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@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@lynxeye.de>
> > >
> > > Good with me, and solves the immediate problem. Thanks for doing the patch.
> > >
> > > Acked-by: Simon Glass <sjg@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.
>
> I can just grab this directly since everyone is happy. now.
>
That would be great, thanks!
-Allen
--
nvpublic
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-22 10:15 [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Lucas Stach
2013-01-22 14:12 ` Simon Glass
@ 2013-01-30 18:25 ` Allen Martin
2013-01-31 0:33 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 0 replies; 7+ messages in thread
From: Allen Martin @ 2013-01-30 18:25 UTC (permalink / raw)
To: u-boot
On Tue, Jan 22, 2013 at 02:15:49AM -0800, Lucas Stach wrote:
> No one expects to end up in a delayed environment if
> CONFIG_DELAY_ENVIRONMENT isn't defined.
>
> Signed-off-by: Lucas Stach <dev@lynxeye.de>
> ---
> 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
Tested on tegra20 trimslice
Acked-by: Allen Martin <amartin@nvidia.com>
--
nvpublic
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [U-Boot, v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
2013-01-22 10:15 [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Lucas Stach
2013-01-22 14:12 ` Simon Glass
2013-01-30 18:25 ` Allen Martin
@ 2013-01-31 0:33 ` Tom Rini
2 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2013-01-31 0:33 UTC (permalink / raw)
To: u-boot
On Tue, Jan 22, 2013 at 12:15:49AM -0000, Lucas Stach wrote:
> No one expects to end up in a delayed environment if
> CONFIG_DELAY_ENVIRONMENT isn't defined.
>
> Signed-off-by: Lucas Stach <dev@lynxeye.de>
> Acked-by: Simon Glass <sjg@chromium.org>
> Acked-by: Allen Martin <amartin@nvidia.com>
Applied to u-boot/master, thanks!
--
Tom
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-01-31 0:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-22 10:15 [U-Boot] [PATCH v2] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Lucas Stach
2013-01-22 14:12 ` Simon Glass
2013-01-30 23:04 ` Allen Martin
2013-01-31 0:31 ` Tom Rini
2013-01-31 0:34 ` Allen Martin
2013-01-30 18:25 ` Allen Martin
2013-01-31 0:33 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.