2015-10-11 21:48:13 +03:00
|
|
|
diff --git a/Makefile b/Makefile
|
2017-06-04 16:27:41 +03:00
|
|
|
index 7bab127..f327099 100644
|
2015-10-11 21:48:13 +03:00
|
|
|
--- a/Makefile
|
|
|
|
+++ b/Makefile
|
2017-06-04 16:27:41 +03:00
|
|
|
@@ -557,9 +557,7 @@ ifeq ($(KBUILD_EXTMOD),)
|
2013-11-16 00:27:01 +04:00
|
|
|
# Carefully list dependencies so we do not try to build scripts twice
|
|
|
|
# in parallel
|
|
|
|
PHONY += scripts
|
|
|
|
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
|
2016-10-23 22:01:06 +03:00
|
|
|
- asm-generic gcc-plugins
|
2013-11-16 00:27:01 +04:00
|
|
|
- $(Q)$(MAKE) $(build)=$(@)
|
|
|
|
+scripts:
|
|
|
|
|
|
|
|
# Objects we will link into vmlinux / subdirs we need to visit
|
|
|
|
init-y := init/
|
2017-06-04 16:27:41 +03:00
|
|
|
@@ -1047,7 +1045,7 @@ prepare0: archprepare gcc-plugins
|
2013-11-16 00:27:01 +04:00
|
|
|
$(Q)$(MAKE) $(build)=.
|
|
|
|
|
|
|
|
# All the preparing..
|
2016-06-13 15:31:59 +03:00
|
|
|
-prepare: prepare0 prepare-objtool
|
2013-11-16 00:27:01 +04:00
|
|
|
+prepare:
|
|
|
|
|
2017-06-04 16:27:41 +03:00
|
|
|
PHONY += prepare-objtool
|
|
|
|
prepare-objtool: $(objtool_target)
|
|
|
|
@@ -1270,13 +1268,8 @@ endif # CONFIG_MODULES
|
2013-11-16 00:27:01 +04:00
|
|
|
CLEAN_DIRS += $(MODVERDIR)
|
|
|
|
|
|
|
|
# Directories & files removed with 'make mrproper'
|
|
|
|
-MRPROPER_DIRS += include/config usr/include include/generated \
|
2015-04-28 16:36:29 +03:00
|
|
|
- arch/*/include/generated .tmp_objdiff
|
|
|
|
-MRPROPER_FILES += .config .config.old .version .old_version \
|
2013-11-16 00:27:01 +04:00
|
|
|
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
|
2015-12-27 16:57:51 +03:00
|
|
|
- signing_key.pem signing_key.priv signing_key.x509 \
|
|
|
|
- x509.genkey extra_certificates signing_key.x509.keyid \
|
2015-04-28 16:36:29 +03:00
|
|
|
- signing_key.x509.signer vmlinux-gdb.py
|
2013-11-16 00:27:01 +04:00
|
|
|
+MRPROPER_DIRS += ""
|
|
|
|
+MRPROPER_FILES += ""
|
|
|
|
|
|
|
|
# clean - Delete most, but leave enough to build external modules
|
|
|
|
#
|
2017-06-04 16:27:41 +03:00
|
|
|
@@ -1298,7 +1291,7 @@ clean: archclean vmlinuxclean
|
2013-11-16 00:27:01 +04:00
|
|
|
#
|
|
|
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
|
|
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
|
|
|
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts)
|
|
|
|
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook)
|
|
|
|
|
|
|
|
PHONY += $(mrproper-dirs) mrproper archmrproper
|
|
|
|
$(mrproper-dirs):
|
2015-10-11 21:48:13 +03:00
|
|
|
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
2017-01-05 18:45:46 +03:00
|
|
|
index 90a091b..7f51efa 100644
|
2015-10-11 21:48:13 +03:00
|
|
|
--- a/scripts/kconfig/Makefile
|
|
|
|
+++ b/scripts/kconfig/Makefile
|
2017-01-05 18:45:46 +03:00
|
|
|
@@ -19,25 +19,16 @@ endif
|
2013-11-16 00:27:01 +04:00
|
|
|
unexport CONFIG_
|
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
xconfig: $(obj)/qconf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
gconfig: $(obj)/gconf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
menuconfig: $(obj)/mconf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
config: $(obj)/conf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) --oldaskconfig $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
nconfig: $(obj)/nconf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
silentoldconfig: $(obj)/conf
|
2015-04-28 16:36:29 +03:00
|
|
|
- $(Q)mkdir -p include/config include/generated
|
2017-01-05 18:45:46 +03:00
|
|
|
- $(Q)test -e include/generated/autoksyms.h || \
|
|
|
|
- touch include/generated/autoksyms.h
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) --$@ $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
|
2015-04-28 16:36:29 +03:00
|
|
|
$(Q)mkdir -p include/config include/generated
|
2017-01-05 18:45:46 +03:00
|
|
|
@@ -83,7 +74,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
2015-07-01 16:47:47 +03:00
|
|
|
PHONY += $(simple-targets)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
$(simple-targets): $(obj)/conf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) --$@ $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-07-01 16:47:47 +03:00
|
|
|
PHONY += oldnoconfig savedefconfig defconfig
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2017-01-05 18:45:46 +03:00
|
|
|
@@ -93,23 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
|
2015-10-11 21:48:13 +03:00
|
|
|
oldnoconfig: olddefconfig
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
savedefconfig: $(obj)/conf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) --$@=defconfig $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
defconfig: $(obj)/conf
|
2013-11-16 00:27:01 +04:00
|
|
|
-ifeq ($(KBUILD_DEFCONFIG),)
|
2015-07-01 16:47:47 +03:00
|
|
|
- $< $(silent) --defconfig $(Kconfig)
|
2016-04-15 13:31:35 +03:00
|
|
|
-else
|
|
|
|
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
|
2015-07-01 16:47:47 +03:00
|
|
|
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
|
|
|
|
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
|
2016-02-02 18:07:44 +03:00
|
|
|
-else
|
|
|
|
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
|
|
|
|
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
|
2016-04-15 13:31:35 +03:00
|
|
|
-endif
|
2013-11-16 00:27:01 +04:00
|
|
|
-endif
|
|
|
|
|
2015-10-11 21:48:13 +03:00
|
|
|
%_defconfig: $(obj)/conf
|
2015-07-01 16:47:47 +03:00
|
|
|
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
2013-11-16 00:27:01 +04:00
|
|
|
|
2015-07-01 16:47:47 +03:00
|
|
|
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
|
2015-04-28 16:36:29 +03:00
|
|
|
|