From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 13 Mar 2015 06:21:40 +0000 (+0900)
Subject: kbuild: mergeconfig: remove redundant $(objtree)
X-Git-Tag: v4.1-rc1~124^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d;p=thirdparty%2Fkernel%2Flinux.git

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: 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>
---

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index be0fad44ddd85..b0e4be28204d5 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -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