On Tue, May 28, 2019 at 9:10 PM Christoph Hellwig <hch@xxxxxxxxxxxxx> wrote:
>
> On Tue, May 28, 2019 at 06:16:14PM +1000, Michael Ellerman wrote:
> > We have several "defconfigs" that are not actually full defconfigs
> > they are just a base set of options which are then merged with other
> > fragments to produce a working defconfig.
The default values from Kconfig files are used
where CONFIG options are not specified by the defconfig.
So, I think corenet_basic_defconfig is a full defconfig
even if it contains a single CONFIG option.
Since the difference between "*_defconfig" and "*.config"
is ambiguous in some cases, it depends on the intended usage.
> > The most obvious example is corenet_basic_defconfig which only
> > contains one symbol CONFIG_CORENET_GENERIC=y. But there is also
> > mpc85xx_base_defconfig which doesn't actually enable CONFIG_PPC_85xx.
> >
> > To avoid confusion, rename these config fragments to "foo_base.config"
> > to make it clearer that they are not full defconfigs.
>
> Adding linux-kbuild, maybe we can make the handling of these fragments
> generic and actually document it..
I do not know how it should be documented.
> >
> > Reported-by: Christophe Leroy <christophe.leroy@xxxxxx>
> > Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> > ---
> > arch/powerpc/Makefile | 12 ++++++------
> > .../{corenet_basic_defconfig => corenet_base.config} | 0
> > .../{mpc85xx_basic_defconfig => mpc85xx_base.config} | 0
> > .../{mpc86xx_basic_defconfig => mpc86xx_base.config} | 0
> > 4 files changed, 6 insertions(+), 6 deletions(-)
> > rename arch/powerpc/configs/{corenet_basic_defconfig => corenet_base.config} (100%)
> > rename arch/powerpc/configs/{mpc85xx_basic_defconfig => mpc85xx_base.config} (100%)
> > rename arch/powerpc/configs/{mpc86xx_basic_defconfig => mpc86xx_base.config} (100%)
> >
> > diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
> > index c345b79414a9..94f735db2229 100644
> > --- a/arch/powerpc/Makefile
> > +++ b/arch/powerpc/Makefile
> > @@ -333,32 +333,32 @@ PHONY += powernv_be_defconfig
> >
> > PHONY += mpc85xx_defconfig
> > mpc85xx_defconfig:
> > - $(call merge_into_defconfig,mpc85xx_basic_defconfig,\
> > + $(call merge_into_defconfig,mpc85xx_base.config,\
> > 85xx-32bit 85xx-hw fsl-emb-nonhw)
> >
> > PHONY += mpc85xx_smp_defconfig
> > mpc85xx_smp_defconfig:
> > - $(call merge_into_defconfig,mpc85xx_basic_defconfig,\
> > + $(call merge_into_defconfig,mpc85xx_base.config,\
> > 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)
> >
> > PHONY += corenet32_smp_defconfig
> > corenet32_smp_defconfig:
> > - $(call merge_into_defconfig,corenet_basic_defconfig,\
> > + $(call merge_into_defconfig,corenet_base.config,\
> > 85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw dpaa)
> >
> > PHONY += corenet64_smp_defconfig
> > corenet64_smp_defconfig:
> > - $(call merge_into_defconfig,corenet_basic_defconfig,\
> > + $(call merge_into_defconfig,corenet_base.config,\
> > 85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw dpaa)
> >
> > PHONY += mpc86xx_defconfig
> > mpc86xx_defconfig:
> > - $(call merge_into_defconfig,mpc86xx_basic_defconfig,\
> > + $(call merge_into_defconfig,mpc86xx_base.config,\
> > 86xx-hw fsl-emb-nonhw)
> >
> > PHONY += mpc86xx_smp_defconfig
> > mpc86xx_smp_defconfig:
> > - $(call merge_into_defconfig,mpc86xx_basic_defconfig,\
> > + $(call merge_into_defconfig,mpc86xx_base.config,\
> > 86xx-smp 86xx-hw fsl-emb-nonhw)
> >
> > PHONY += ppc32_allmodconfig
> > diff --git a/arch/powerpc/configs/corenet_basic_defconfig b/arch/powerpc/configs/corenet_base.config
> > similarity index 100%
> > rename from arch/powerpc/configs/corenet_basic_defconfig
> > rename to arch/powerpc/configs/corenet_base.config
> > diff --git a/arch/powerpc/configs/mpc85xx_basic_defconfig b/arch/powerpc/configs/mpc85xx_base.config
> > similarity index 100%
> > rename from arch/powerpc/configs/mpc85xx_basic_defconfig
> > rename to arch/powerpc/configs/mpc85xx_base.config
> > diff --git a/arch/powerpc/configs/mpc86xx_basic_defconfig b/arch/powerpc/configs/mpc86xx_base.config
> > similarity index 100%
> > rename from arch/powerpc/configs/mpc86xx_basic_defconfig
> > rename to arch/powerpc/configs/mpc86xx_base.config
> > --
> > 2.20.1
> >
> ---end quoted text---
--
Best Regards
Masahiro Yamada
