Merge branch 'origin/master' (early part)

1 files changed, 12 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 0a2a3db01..60999dd4b 100644
--- a/Makefile
+++ b/Makefile
@@ -434,7 +434,12 @@ ifeq ($(config-targets),1)
 -include $(srctree)/arch/$(ARCH)/Makefile
 export KBUILD_DEFCONFIG
 
-config %config: scripts_basic outputmakefile gen_build_files FORCE
+config: scripts_basic outputmakefile gen_build_files FORCE
+        $(Q)mkdir -p include
+        $(Q)$(MAKE) $(build)=scripts/kconfig $@
+        $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+
+%config: scripts_basic outputmakefile gen_build_files FORCE
         $(Q)mkdir -p include
         $(Q)$(MAKE) $(build)=scripts/kconfig $@
         $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -839,7 +844,7 @@ export CPPFLAGS_busybox.lds += -P -C -U$(ARCH)
 
 #       Split autoconf.h into include/linux/config/*
 quiet_cmd_gen_bbconfigopts = GEN     include/bbconfigopts.h
-      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs > include/bbconfigopts.h
+      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs include/bbconfigopts.h include/bbconfigopts_bz2.h
 quiet_cmd_split_autoconf   = SPLIT   include/autoconf.h -> include/config/*
       cmd_split_autoconf   = scripts/basic/split-include include/autoconf.h include/config
 #bbox# piggybacked generation of few .h files
@@ -1287,9 +1292,13 @@ endif
         $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 
 # Modules
-/ %/: prepare scripts FORCE
+%/: prepare scripts FORCE
         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
         $(build)=$(build-dir)
+/: prepare scripts FORCE
+        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+        $(build)=$(build-dir)
+
 %.ko: prepare scripts FORCE
         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
         $(build)=$(build-dir) $(@:.ko=.o)