30 Jan
2013
30 Jan
'13
7:25 p.m.
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@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Tested on tegra20 trimslice
Acked-by: Allen Martin amartin@nvidia.com
--
nvpublic