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

login
register
mail settings
Submitter Lucas Stach
Date Jan. 22, 2013, 12:22 a.m.
Message ID <1358814158-5264-1-git-send-email-dev@lynxeye.de>
Download mbox | patch
Permalink /patch/214300/
State Changes Requested
Delegated to: Tom Rini
Headers show

Comments

Lucas Stach - Jan. 22, 2013, 12:22 a.m.
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(-)
Simon Glass - Jan. 22, 2013, 12:33 a.m.
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

Patch

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