Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63a91033 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: add generic mergeconfig target, %.config 



"scripts/kconfig/merge_config.sh && make oldconfig" works well
enough for merging local config fragments, but Kbuild currently has
the entry points only for "kvmconfig" and "tinyconfig".

This commit provides the generic target for mergeconfig, so we can
manage our own config fragments easily:
put "foo.config" in arch/$(SRCARCH)/configs/ or kernel/configs/,
and then run "make foo.config".

Now "make kvmconfig" is just a shorthand of "make kvm_guest.config".
Likewise, "make tinyconfig" is equivalent to
"make allnoconfig tiny.config".

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Reviewed-by: default avatarDarren Hart <dvhart@linux.intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent bc8f8f5f

scripts/kconfig/Makefile

+9 −10
Original line number Diff line number Diff line
@@ -104,21 +104,20 @@ endif 
%_defconfig: $(obj)/conf

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)



configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)

configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)



define mergeconfig

$(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture))

$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(call configfiles,$(1))

%.config: $(obj)/conf

	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)

	+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig

endef



PHONY += kvmconfig

kvmconfig:

	$(call mergeconfig,kvm_guest)

kvmconfig: kvm_guest.config

	@:



PHONY += tinyconfig

tinyconfig: allnoconfig

	$(call mergeconfig,tiny)

tinyconfig:

	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config



# Help text used by make help

help: