[PATCH V4 1/8] env_default: Allow CONFIG_EXTRA_ENV_TEXT to override CFG_EXTRA_ENV_SETTINGS

Nishanth Menon nm at ti.com
Wed Aug 23 17:06:58 CEST 2023


On 10:42-20230823, Tom Rini wrote:
[...]

> > diff --git a/include/env_default.h b/include/env_default.h
> > index b16c22d5a28c..714dfa9e845e 100644
> > --- a/include/env_default.h
> > +++ b/include/env_default.h
> > @@ -112,12 +112,12 @@ const char default_environment[] = {
> >  #ifdef CONFIG_MTDPARTS_DEFAULT
> >  	"mtdparts="	CONFIG_MTDPARTS_DEFAULT		"\0"
> >  #endif
> > +#ifdef	CFG_EXTRA_ENV_SETTINGS
> > +	CFG_EXTRA_ENV_SETTINGS
> > +#endif
> >  #ifdef CONFIG_EXTRA_ENV_TEXT
> >  	/* This is created in the Makefile */
> >  	CONFIG_EXTRA_ENV_TEXT
> > -#endif
> > -#ifdef	CFG_EXTRA_ENV_SETTINGS
> > -	CFG_EXTRA_ENV_SETTINGS
> >  #endif
> >  	"\0"
> >  #else /* CONFIG_USE_DEFAULT_ENV_FILE */
> 
> The problem is that I believe we intend for CFG_EXTRA_ENV_SETTINGS to be
> where we can override things in a more final manner.

I am confused - if the intent is to move to text env, it should have
priority over the extra_env settings.

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D


More information about the U-Boot mailing list