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

[Tom Rini]

On Wed, Aug 23, 2023 at 10:06:58AM -0500, Nishanth Menon wrote:
> 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.

If you have a text environment you really shouldn't have anything
defined.  But that restriction meant that almost nothing could be
migrated (since we didn't have the boostd stuff far enough along), so I
made it so we would at least end up merging the two.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20230823/005a1205/attachment.sig>