Skip to contentSkip to conversation

CONFIG_DELAY_ENVIRONMENT usage

U-Boot Allen Martin 2 participants 3 messages Jan 30, 2013

lore
Share & tools
lore
#0 lore raw

Simon, I had a question about your CONFIG_DELAY_ENVIRONMENT patch. In the commit description it says:

When CONFIG_DELAY_ENVIRONMENT is defined, it is convenient to have a run-time way of enabling loading of the environment. Add this to the fdt as /config/delay-environment.

In the code, it's actually reading /config/load-environment, and it defaults to prevent loading environment regardless if CONFIG_DELAY_ENVIRONMENT is set or not:

static int should_load_env(void)
{

#ifdef CONFIG_OF_CONTROL
       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
#elif defined CONFIG_DELAY_ENVIRONMENT
       return 0;
#else
       return 1;

#endif
}

The problem I'm seeing is that this regressed environment loading on all boards that use fdt, because none of them have /config/load-environment defined. If I read the commit message correctly, I think the actual intention is:

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);
#else
        return 0;
#endif
#else
        return 1;

#endif
}

Is my understanding correct?

-Allen

Signature · 1 line
nvpublic
#1 lore raw

Hi Allen,

Am Dienstag, den 29.01.2013, 19:05 -0800 schrieb Allen Martin:

Quoted 16 lines

The problem I'm seeing is that this regressed environment loading on all boards that use fdt, because none of them have /config/load-environment defined. If I read the commit message correctly, I think the actual intention is:

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);
#else
        return 0;
#endif
#else
        return 1;
Quoted 3 lines

#endif
}

There is already a patch for that on the mailing list. See
http://www.mail-archive.com/u-boot at lists.denx.de/msg103841.html

We agreed that just swapping around the default value for the FDT case is the right thing to do.

Regards,
Lucas

#2 lore raw
Quoted 23 lines · Lucas Stach

Hi Allen,

Am Dienstag, den 29.01.2013, 19:05 -0800 schrieb Allen Martin:

Quoted 16 lines

The problem I'm seeing is that this regressed environment loading on all boards that use fdt, because none of them have /config/load-environment defined. If I read the commit message correctly, I think the actual intention is:

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);
#else
        return 0;
#endif
#else
        return 1;
Quoted 3 lines

#endif
}

Quoted 5 lines

There is already a patch for that on the mailing list. See
http://www.mail-archive.com/u-boot at lists.denx.de/msg103841.html

We agreed that just swapping around the default value for the FDT case is the right thing to do.

Thanks for the pointer Lucas, I didn't notice the previous patch.

-Allen

Signature · 1 line
nvpublic