summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/kbuild/makefiles.rst4
-rw-r--r--Makefile16
2 files changed, 12 insertions, 8 deletions
diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst
index 3b9a8bc671e2..18ef339f687b 100644
--- a/Documentation/kbuild/makefiles.rst
+++ b/Documentation/kbuild/makefiles.rst
@@ -291,6 +291,10 @@ Example::
# arch/x86/kernel/Makefile
extra-y += vmlinux.lds
+extra-y is now deprecated because this is equivalent to:
+
+ always-$(KBUILD_BUILTIN) += vmlinux.lds
+
$(extra-y) should only contain targets needed for vmlinux.
Kbuild skips extra-y when vmlinux is apparently not a final goal.
diff --git a/Makefile b/Makefile
index fe2f1cb4d9b7..e07692d485e6 100644
--- a/Makefile
+++ b/Makefile
@@ -749,7 +749,7 @@ targets :=
# Normally, just do built-in.
KBUILD_MODULES :=
-KBUILD_BUILTIN := 1
+KBUILD_BUILTIN := y
# If we have only "make modules", don't compile built-in objects.
ifeq ($(MAKECMDGOALS),modules)
@@ -761,11 +761,11 @@ endif
# Just "make" or "make all" shall build modules as well
ifneq ($(filter all modules nsdeps compile_commands.json clang-%,$(MAKECMDGOALS)),)
- KBUILD_MODULES := 1
+ KBUILD_MODULES := y
endif
ifeq ($(MAKECMDGOALS),)
- KBUILD_MODULES := 1
+ KBUILD_MODULES := y
endif
export KBUILD_MODULES KBUILD_BUILTIN
@@ -1193,7 +1193,7 @@ export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
ifdef CONFIG_TRIM_UNUSED_KSYMS
# For the kernel to actually contain only the needed exported symbols,
# we have to build modules as well to determine what those symbols are.
-KBUILD_MODULES := 1
+KBUILD_MODULES := y
endif
# '$(AR) mPi' needs 'T' to workaround the bug of llvm-ar <= 14
@@ -1533,7 +1533,7 @@ all: modules
# the built-in objects during the descend as well, in order to
# make sure the checksums are up to date before we record them.
ifdef CONFIG_MODVERSIONS
- KBUILD_BUILTIN := 1
+ KBUILD_BUILTIN := y
endif
# Build modules
@@ -1542,7 +1542,7 @@ endif
# *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFO_BTF_MODULES
# is an exception.
ifdef CONFIG_DEBUG_INFO_BTF_MODULES
-KBUILD_BUILTIN := 1
+KBUILD_BUILTIN := y
modules: vmlinux
endif
@@ -1858,7 +1858,7 @@ filechk_kernel.release = echo $(KERNELRELEASE)
# We are always building only modules.
KBUILD_BUILTIN :=
-KBUILD_MODULES := 1
+KBUILD_MODULES := y
build-dir := .
@@ -1986,7 +1986,7 @@ endif
single-goals := $(addprefix $(build-dir)/, $(single-no-ko))
-KBUILD_MODULES := 1
+KBUILD_MODULES := y
endif