summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-13 15:21:40 +0900
committerMichal Marek <mmarek@suse.cz>2015-03-24 16:48:44 +0100
commit371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d (patch)
tree6007027dba4ecd98ac50153e831895f61a0bad16 /scripts/kconfig
parentb9fe99c5b994c6ddc57780993966b18899526c0b (diff)
downloadblackbird-op-linux-371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d.tar.gz
blackbird-op-linux-371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d.zip
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>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index be0fad44ddd8..b0e4be28204d 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
OpenPOWER on IntegriCloud