kbuild: mergeconfig: remove redundant $(objtree)
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 13 Mar 2015 06:21:40 +0000 (15:21 +0900)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 Mar 2015 15:48:44 +0000 (16:48 +0100)
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/Makefile

index be0fad44ddd851e69a298b20079f29ffdbbd8385..b0e4be28204d58d21ba7d40ab1d2dc3ba797593c 100644 (file)
@@ -108,7 +108,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(S
 
 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 -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
 endef