Merge branch 'master' into for-linus

1 files changed, 40 insertions, 37 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 7ea649da1940..de934def410f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -21,17 +21,17 @@ menuconfig: $(obj)/mconf
         $< $(Kconfig)
 
 config: $(obj)/conf
-        $< $(Kconfig)
+        $< --oldaskconfig $(Kconfig)
 
 nconfig: $(obj)/nconf
         $< $(Kconfig)
 
 oldconfig: $(obj)/conf
-        $< -o $(Kconfig)
+        $< --$@ $(Kconfig)
 
 silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/generated
-        $< -s $(Kconfig)
+        $< --$@ $(Kconfig)
 
 # if no path is given, then use src directory to find file
 ifdef LSMOD
@@ -44,15 +44,15 @@ endif
 localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/generated
         $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-        $(Q)if [ -f .config ]; then                             \
-                        cmp -s .tmp.config .config ||           \
-                        (mv -f .config .config.old.1;           \
-                         mv -f .tmp.config .config;             \
-                         $(obj)/conf -s $(Kconfig);             \
-                         mv -f .config.old.1 .config.old)       \
-        else                                                    \
-                        mv -f .tmp.config .config;              \
-                        $(obj)/conf -s $(Kconfig);              \
+        $(Q)if [ -f .config ]; then                                     \
+                        cmp -s .tmp.config .config ||                   \
+                        (mv -f .config .config.old.1;                   \
+                         mv -f .tmp.config .config;                     \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         mv -f .config.old.1 .config.old)               \
+        else                                                            \
+                        mv -f .tmp.config .config;                      \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
         fi
         $(Q)rm -f .tmp.config
 
@@ -60,15 +60,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/generated
         $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
         $(Q)sed -i s/=m/=y/ .tmp.config
-        $(Q)if [ -f .config ]; then                             \
-                        cmp -s .tmp.config .config ||           \
-                        (mv -f .config .config.old.1;           \
-                         mv -f .tmp.config .config;             \
-                         $(obj)/conf -s $(Kconfig);             \
-                         mv -f .config.old.1 .config.old)       \
-        else                                                    \
-                        mv -f .tmp.config .config;              \
-                        $(obj)/conf -s $(Kconfig);              \
+        $(Q)if [ -f .config ]; then                                     \
+                        cmp -s .tmp.config .config ||                   \
+                        (mv -f .config .config.old.1;                   \
+                         mv -f .tmp.config .config;                     \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         mv -f .config.old.1 .config.old)               \
+        else                                                            \
+                        mv -f .tmp.config .config;                      \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
         fi
         $(Q)rm -f .tmp.config
 
@@ -95,30 +95,29 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)rm -f arch/um/Kconfig.arch
         $(Q)rm -f $(obj)/config.pot
 
-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
+PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
 
-randconfig: $(obj)/conf
-        $< -r $(Kconfig)
+allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
+        $< --$@ $(Kconfig)
 
-allyesconfig: $(obj)/conf
-        $< -y $(Kconfig)
+PHONY += listnewconfig oldnoconfig savedefconfig defconfig
 
-allnoconfig: $(obj)/conf
-        $< -n $(Kconfig)
+listnewconfig oldnoconfig: $(obj)/conf
+        $< --$@ $(Kconfig)
 
-allmodconfig: $(obj)/conf
-        $< -m $(Kconfig)
+savedefconfig: $(obj)/conf
+        $< --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
-        $< -d $(Kconfig)
+        $< --defconfig $(Kconfig)
 else
         @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-        $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 endif
 
 %_defconfig: $(obj)/conf
-        $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
+        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
 # Help text used by make help
 help:
@@ -131,11 +130,15 @@ help:
         @echo  '  localmodconfig  - Update current config disabling modules not loaded'
         @echo  '  localyesconfig  - Update current config converting local mods to core'
         @echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
-        @echo  '  randconfig      - New config with random answer to all options'
-        @echo  '  defconfig       - New config with default answer to all options'
-        @echo  '  allmodconfig    - New config selecting modules when possible'
-        @echo  '  allyesconfig    - New config where all options are accepted with yes'
+        @echo  '  defconfig       - New config with default from ARCH supplied defconfig'
+        @echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'
         @echo  '  allnoconfig     - New config where all options are answered with no'
+        @echo  '  allyesconfig    - New config where all options are accepted with yes'
+        @echo  '  allmodconfig    - New config selecting modules when possible'
+        @echo  '  alldefconfig    - New config with all symbols set to default'
+        @echo  '  randconfig      - New config with random answer to all options'
+        @echo  '  listnewconfig   - List new options'
+        @echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
 
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh