On 2025-02-01 11:13:05+0100, Willy Tarreau wrote: > On Thu, Jan 23, 2025 at 08:37:37AM +0100, Thomas Weißschuh wrote: > > kbuild already contains logic to merge predefines snippets into a > > defconfig file. This already works nicely with the current "defconfig" > > target. Make use of the snippet and drop the custom logic. > > > > Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx> > > --- > > tools/testing/selftests/nolibc/Makefile | 9 +-------- > > 1 file changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile > > index 7d14a7c0cb62608f328b251495264517d333db2e..ba044c8a042ce345ff90bdd35569de4b5acd117d 100644 > > --- a/tools/testing/selftests/nolibc/Makefile > > +++ b/tools/testing/selftests/nolibc/Makefile > > @@ -82,7 +82,7 @@ DEFCONFIG_x86 = defconfig > > DEFCONFIG_arm64 = defconfig > > DEFCONFIG_arm = multi_v7_defconfig > > DEFCONFIG_mips32le = malta_defconfig > > -DEFCONFIG_mips32be = malta_defconfig > > +DEFCONFIG_mips32be = malta_defconfig generic/eb.config > > DEFCONFIG_ppc = pmac32_defconfig > > DEFCONFIG_ppc64 = powernv_be_defconfig > > DEFCONFIG_ppc64le = powernv_defconfig > > @@ -93,9 +93,6 @@ DEFCONFIG_s390 = defconfig > > DEFCONFIG_loongarch = defconfig > > DEFCONFIG = $(DEFCONFIG_$(XARCH)) > > > > -EXTRACONFIG_mips32be = -d CONFIG_CPU_LITTLE_ENDIAN -e CONFIG_CPU_BIG_ENDIAN > > -EXTRACONFIG = $(EXTRACONFIG_$(XARCH)) > > - > > # optional tests to run (default = all) > > TEST = > > > > @@ -265,10 +262,6 @@ initramfs: nolibc-test > > > > defconfig: > > $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare > > - $(Q)if [ -n "$(EXTRACONFIG)" ]; then \ > > - $(srctree)/scripts/config --file $(objtree)/.config $(EXTRACONFIG); \ > > - $(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) olddefconfig < /dev/null; \ > > - fi > > OK it's no longer needed thanks to your change above, but to we really > want to get rid of that feature allowing anyone to add their own extra > config ? I'm not sure. For example maybe the current build script helps > on bare metal, when trying to add support for new archs or other features > not yet in defconfig ? We could leave EXTRACONFIG_* empty by default and > user-defined, as I don't feel like it blocks anything to keep it. Makes sense, let's keep it. It's currently not possible for kbuild to pick up config snippets outside of a few special locations. I'll fix this up locally and apply the series directly. Thomas
