kbuild: trivial fixes in Makefile
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
e838db685f
commit
070b98bfda
34
Makefile
34
Makefile
@ -199,7 +199,7 @@ KBUILD_BUILTIN := 1
|
|||||||
# If we have only "make modules", don't compile built-in objects.
|
# If we have only "make modules", don't compile built-in objects.
|
||||||
# When we're building modules with modversions, we need to consider
|
# When we're building modules with modversions, we need to consider
|
||||||
# the built-in objects during the descend as well, in order to
|
# the built-in objects during the descend as well, in order to
|
||||||
# make sure the checksums are uptodate before we record them.
|
# make sure the checksums are up to date before we record them.
|
||||||
|
|
||||||
ifeq ($(MAKECMDGOALS),modules)
|
ifeq ($(MAKECMDGOALS),modules)
|
||||||
KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
|
KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
|
||||||
@ -232,7 +232,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
|
|||||||
#
|
#
|
||||||
# If $(quiet) is empty, the whole command will be printed.
|
# If $(quiet) is empty, the whole command will be printed.
|
||||||
# If it is set to "quiet_", only the short version will be printed.
|
# If it is set to "quiet_", only the short version will be printed.
|
||||||
# If it is set to "silent_", nothing wil be printed at all, since
|
# If it is set to "silent_", nothing will be printed at all, since
|
||||||
# the variable $(silent_cmd_cc_o_c) doesn't exist.
|
# the variable $(silent_cmd_cc_o_c) doesn't exist.
|
||||||
#
|
#
|
||||||
# A simple variant is to prefix commands with $(Q) - that's useful
|
# A simple variant is to prefix commands with $(Q) - that's useful
|
||||||
@ -268,7 +268,7 @@ MAKEFLAGS += --include-dir=$(srctree)
|
|||||||
include $(srctree)/scripts/Kbuild.include
|
include $(srctree)/scripts/Kbuild.include
|
||||||
|
|
||||||
# Do not use make's built-in rules and variables
|
# Do not use make's built-in rules and variables
|
||||||
# This increases performance and avoid hard-to-debug behaviour
|
# This increases performance and avoid hard-to-debug behavour
|
||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
|
|
||||||
# Make variables (CC, etc...)
|
# Make variables (CC, etc...)
|
||||||
@ -314,10 +314,10 @@ AFLAGS := -D__ASSEMBLY__
|
|||||||
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
||||||
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||||
|
|
||||||
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
|
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
|
||||||
ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
|
export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
|
||||||
CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
|
export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
|
||||||
HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
|
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
|
||||||
|
|
||||||
export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
|
export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
|
||||||
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
|
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
|
||||||
@ -417,7 +417,7 @@ else
|
|||||||
ifeq ($(KBUILD_EXTMOD),)
|
ifeq ($(KBUILD_EXTMOD),)
|
||||||
# Additional helpers built in scripts/
|
# Additional helpers built in scripts/
|
||||||
# Carefully list dependencies so we do not try to build scripts twice
|
# Carefully list dependencies so we do not try to build scripts twice
|
||||||
# in parrallel
|
# in parallel
|
||||||
PHONY += scripts
|
PHONY += scripts
|
||||||
scripts: scripts_basic include/config/auto.conf
|
scripts: scripts_basic include/config/auto.conf
|
||||||
$(Q)$(MAKE) $(build)=$(@)
|
$(Q)$(MAKE) $(build)=$(@)
|
||||||
@ -443,7 +443,7 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
|
|||||||
|
|
||||||
# If .config is newer than include/config/auto.conf, someone tinkered
|
# If .config is newer than include/config/auto.conf, someone tinkered
|
||||||
# with it and forgot to run make oldconfig.
|
# with it and forgot to run make oldconfig.
|
||||||
# if auto.conf.cmd is missing then we are probarly in a cleaned tree so
|
# if auto.conf.cmd is missing then we are probably in a cleaned tree so
|
||||||
# we execute the config step to be sure to catch updated Kconfig files
|
# we execute the config step to be sure to catch updated Kconfig files
|
||||||
include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
|
include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
|
||||||
ifeq ($(KBUILD_EXTMOD),)
|
ifeq ($(KBUILD_EXTMOD),)
|
||||||
@ -460,7 +460,7 @@ endif
|
|||||||
# The all: target is the default when no target is given on the
|
# The all: target is the default when no target is given on the
|
||||||
# command line.
|
# command line.
|
||||||
# This allow a user to issue only 'make' to build a kernel including modules
|
# This allow a user to issue only 'make' to build a kernel including modules
|
||||||
# Defaults vmlinux but it is usually overriden in the arch makefile
|
# Defaults vmlinux but it is usually overridden in the arch makefile
|
||||||
all: vmlinux
|
all: vmlinux
|
||||||
|
|
||||||
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
||||||
@ -492,11 +492,11 @@ CHECKFLAGS += $(NOSTDINC_FLAGS)
|
|||||||
# warn about C99 declaration after statement
|
# warn about C99 declaration after statement
|
||||||
CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
|
CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
|
||||||
|
|
||||||
# disable pointer signedness warnings in gcc 4.0
|
# disable pointer signed / unsigned warnings in gcc 4.0
|
||||||
CFLAGS += $(call cc-option,-Wno-pointer-sign,)
|
CFLAGS += $(call cc-option,-Wno-pointer-sign,)
|
||||||
|
|
||||||
# Default kernel image to build when no specific target is given.
|
# Default kernel image to build when no specific target is given.
|
||||||
# KBUILD_IMAGE may be overruled on the commandline or
|
# KBUILD_IMAGE may be overruled on the command line or
|
||||||
# set in the environment
|
# set in the environment
|
||||||
# Also any assignments in arch/$(ARCH)/Makefile take precedence over
|
# Also any assignments in arch/$(ARCH)/Makefile take precedence over
|
||||||
# this default value
|
# this default value
|
||||||
@ -510,7 +510,7 @@ export INSTALL_PATH ?= /boot
|
|||||||
#
|
#
|
||||||
# INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
|
# INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
|
||||||
# relocations required by build roots. This is not defined in the
|
# relocations required by build roots. This is not defined in the
|
||||||
# makefile but the arguement can be passed to make if needed.
|
# makefile but the argument can be passed to make if needed.
|
||||||
#
|
#
|
||||||
|
|
||||||
MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
|
MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
|
||||||
@ -556,7 +556,7 @@ libs-y := $(libs-y1) $(libs-y2)
|
|||||||
|
|
||||||
# Build vmlinux
|
# Build vmlinux
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# vmlinux is build from the objects selected by $(vmlinux-init) and
|
# vmlinux is built from the objects selected by $(vmlinux-init) and
|
||||||
# $(vmlinux-main). Most are built-in.o files from top-level directories
|
# $(vmlinux-main). Most are built-in.o files from top-level directories
|
||||||
# in the kernel tree, others are specified in arch/$(ARCH)Makefile.
|
# in the kernel tree, others are specified in arch/$(ARCH)Makefile.
|
||||||
# Ordering when linking is important, and $(vmlinux-init) must be first.
|
# Ordering when linking is important, and $(vmlinux-init) must be first.
|
||||||
@ -757,7 +757,7 @@ localver = $(subst $(space),, \
|
|||||||
|
|
||||||
# If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called
|
# If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called
|
||||||
# and if the SCM is know a tag from the SCM is appended.
|
# and if the SCM is know a tag from the SCM is appended.
|
||||||
# The appended tag is determinded by the SCM used.
|
# The appended tag is determined by the SCM used.
|
||||||
#
|
#
|
||||||
# Currently, only git is supported.
|
# Currently, only git is supported.
|
||||||
# Other SCMs can edit scripts/setlocalversion and add the appropriate
|
# Other SCMs can edit scripts/setlocalversion and add the appropriate
|
||||||
@ -1088,7 +1088,7 @@ else # KBUILD_EXTMOD
|
|||||||
# make M=dir modules Make all modules in specified dir
|
# make M=dir modules Make all modules in specified dir
|
||||||
# make M=dir Same as 'make M=dir modules'
|
# make M=dir Same as 'make M=dir modules'
|
||||||
# make M=dir modules_install
|
# make M=dir modules_install
|
||||||
# Install the modules build in the module directory
|
# Install the modules built in the module directory
|
||||||
# Assumes install directory is already created
|
# Assumes install directory is already created
|
||||||
|
|
||||||
# We are always building modules
|
# We are always building modules
|
||||||
@ -1186,7 +1186,7 @@ else
|
|||||||
ALLINCLUDE_ARCHS := $(ARCH)
|
ALLINCLUDE_ARCHS := $(ARCH)
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behaviour.
|
#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.
|
||||||
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
|
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user