summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile4
-rw-r--r--scripts/kconfig/conf.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 7df7ea6780e3..ce7d754e95c5 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -66,11 +66,11 @@ ifeq ($(KBUILD_DEFCONFIG),)
$< -d $(Kconfig)
else
@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
- $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+ $(Q)$< -d -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
endif
%_defconfig: $(obj)/conf
- $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
+ $(Q)$< -d -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
# Help text used by make help
help:
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index e17767e729c9..9a27638fe699 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -515,7 +515,6 @@ int main(int ac, char **av)
input_mode = set_default;
break;
case 'D':
- input_mode = set_default;
defconfig_file = optarg;
break;
case 'n':