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

Commit 371cfd4f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: mergeconfig: remove redundant $(objtree) 



Kbuild always runs in $(objtree).  Actually, $(objtree) is always
set to "." by the top-level Makefile.

We can omit "-O $(objtree)" and "$(objtree)/".

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 b9fe99c5

scripts/kconfig/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S 




define mergeconfig

define mergeconfig

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

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

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

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

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

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

endef

endef