diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-04-25 22:39:23 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-04-25 22:39:23 -0400 |
| commit | 9a7c2426f566cbe85af1d323be76609785bf25f8 (patch) | |
| tree | 8f9bfbc4e18ca076cb627bd08280c2df7a09bd4d /scripts | |
| parent | 96be386bd63e323ab4ce2e474a8884a2b152b9a0 (diff) | |
| download | lwn-9a7c2426f566cbe85af1d323be76609785bf25f8.tar.gz lwn-9a7c2426f566cbe85af1d323be76609785bf25f8.zip | |
kconfig: -D just takes default config w/out assuming input_mode is set_default
Previously, both -d and -D specified that input_mode was set_default; the
only difference was that -D took an argument (setting defconfig_file).
With this change, -d specifies set_default, and -D merely sets defconfig_file.
This means that (for example) 'make i386_defconfig' becomes
'conf -d -D $def $(Kconfig)'.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 4 | ||||
| -rw-r--r-- | scripts/kconfig/conf.c | 1 |
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': |