kconfig: fixup add DEFCONFIG_PATH support

The previous DEFCONFIG_PATH support patch was not correctly cherry-picked. The
problem was that it added to the recipe instead of replacing it.

This patch patch fixes the patch correctly.

bug 1509349

Change-Id: Ica068290d1fea8e8677df0478423e299f337ff01
Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com>

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 0265f6a565431602edeac435e9fcae2edeecc334..203045ad220642a4a363f950129783f4b02761c6 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -105,11 +105,10 @@ else
 endif
 
 %_defconfig: $(obj)/conf
-       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 ifeq ($(DEFCONFIG_PATH),)
-       $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 else
-       $(Q)$< --defconfig=$(DEFCONFIG_PATH)/$@ $(Kconfig)
+       $(Q)$< $(silent) --defconfig=$(DEFCONFIG_PATH)/$@ $(Kconfig)
 endif
 
 configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)