Hi Jonas, On Sat, 28 Sept 2024 at 22:56, Jonas Karlman <jo...@kwiboo.se> wrote: > > Hi Simon, > > On 2024-09-28 22:00, Simon Glass wrote: > > The new name 'xPL' is intended to indicate a build of any phase which is > > not U-Boot proper. Define it for all such phases. > > > > Note that we also define CONFIG_SPL_BUILD for all xPL builds. This > > preserves existing behaviour, but future patches will adjust that. > > > > Signed-off-by: Simon Glass <s...@chromium.org> > > --- > > > > (no changes since v1) > > > > scripts/Makefile.autoconf | 6 +++--- > > scripts/Makefile.xpl | 9 +++++---- > > 2 files changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf > > index b42f9b525fe..d7544022a31 100644 > > --- a/scripts/Makefile.autoconf > > +++ b/scripts/Makefile.autoconf > > @@ -83,15 +83,15 @@ u-boot.cfg: include/config.h FORCE > > > > spl/u-boot.cfg: include/config.h FORCE > > $(Q)mkdir -p $(dir $@) > > - $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD) > > + $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_SPL_BUILD) > > > > tpl/u-boot.cfg: include/config.h FORCE > > $(Q)mkdir -p $(dir $@) > > - $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD) > > + $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_SPL_BUILD > > -DCONFIG_TPL_BUILD) > > > > vpl/u-boot.cfg: include/config.h FORCE > > $(Q)mkdir -p $(dir $@) > > - $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD -DCONFIG_VPL_BUILD) > > + $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_SPL_BUILD > > -DCONFIG_VPL_BUILD) > > > > include/autoconf.mk: u-boot.cfg > > $(call cmd,autoconf) > > diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl > > index 3091311a3d2..ad21d451a30 100644 > > --- a/scripts/Makefile.xpl > > +++ b/scripts/Makefile.xpl > > @@ -21,15 +21,16 @@ include $(srctree)/scripts/Kbuild.include > > > > -include include/config/auto.conf > > > > -# This file contains 0, 1 or 2 lines > > +# This file contains 0, 2 or 3 lines > > # It is empty for U-Boot proper (where $(obj) is empty) > > -# For any xPL build it contains CONFIG_SPL_BUILD=y > > -# For TPL builds it has CONFIG_SPL_BUILD=y and CONFIG_TPL_BUILD=y > > -# For VPL builds it has CONFIG_SPL_BUILD=y and CONFIG_VPL_BUILD=y > > +# For any xPL build it contains CONFIG_SPL_BUILD=y and CONFIG_XPL_BUILD=y > > +# - for TPL builds it also contains CONFIG_TPL_BUILD=y > > +# - for VPL builds it also contains CONFIG_VPL_BUILD=y > > This comment block was just added in the prior patch, and now changed > and re-formatted, why not just add the comments in this patch or at > least this patch should only contain the addition of XPL_BUILD.
It is changing because this patch changes how things work. I documented it properly in the previous patch so that it is clear what is changing in this patch. I suppose I could just drop the changes in the previous patch, but I like the idea of clearly documenting what is going on, in case we have to come back to this later. [..] Regards, Simon
