[U-Boot] [PATCH] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
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 --- arch/arm/lib/board.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index cfe32cc..1a32611 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -487,10 +487,12 @@ static char *failed = "*** failed ***\n"; */ static int should_load_env(void) { +#ifdef CONFIG_DELAY_ENVIRONMENT #ifdef CONFIG_OF_CONTROL return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0); -#elif defined CONFIG_DELAY_ENVIRONMENT +#else return 0; +#endif #else return 1; #endif
Hi Lucas,
On Mon, Jan 21, 2013 at 4:22 PM, 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
arch/arm/lib/board.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index cfe32cc..1a32611 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -487,10 +487,12 @@ static char *failed = "*** failed ***\n"; */ static int should_load_env(void) { +#ifdef CONFIG_DELAY_ENVIRONMENT #ifdef CONFIG_OF_CONTROL return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
The only problem with this as that now you have two separate controls. Part of the intent with CONFIG_OF_CONTROL is to reduce the amount of #ifdef'ing going on - how about just changing the default value here to 1?
-#elif defined CONFIG_DELAY_ENVIRONMENT +#else return 0; +#endif #else return 1;
#endif
1.8.0.2
Regards, Simon
participants (2)
-
Lucas Stach -
Simon Glass