2018-05-06 21:58:06 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0
|
2014-02-04 08:24:27 +00:00
|
|
|
# ==========================================================================
|
|
|
|
|
# Building
|
|
|
|
|
# ==========================================================================
|
|
|
|
|
|
kbuild: use Linux Kernel build scripts
Now we are ready to switch over to real Kbuild.
This commit disables temporary scripts:
scripts/{Makefile.build.tmp, Makefile.host.tmp}
and enables real Kbuild scripts:
scripts/{Makefile.build,Makefile.host,Makefile.lib}.
This switch is triggered by the line in scripts/Kbuild.include
-build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj
+build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
We need to adjust some build scripts for U-Boot.
But smaller amount of modification is preferable.
Additionally, we need to fix compiler flags which are
locally added or removed.
In Kbuild, it is not allowed to change CFLAGS locally.
Instead, ccflags-y, asflags-y, cppflags-y,
CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).o
are prepared for that purpose.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Gerhard Sittig <gsi@denx.de>
2014-02-04 08:24:28 +00:00
|
|
|
# Modified for U-Boot
|
2022-04-30 06:56:52 +00:00
|
|
|
prefix := vpl
|
|
|
|
|
src := $(patsubst $(prefix)/%,%,$(obj))
|
|
|
|
|
ifeq ($(obj),$(src))
|
kconfig: switch to Kconfig
This commit enables Kconfig.
Going forward, we use Kconfig for the board configuration.
mkconfig will never be used. Nor will include/config.mk be generated.
Kconfig must be adjusted for U-Boot because our situation is
a little more complicated than Linux Kernel.
We have to generate multiple boot images (Normal, SPL, TPL)
from one source tree.
Each image needs its own configuration input.
Usage:
Run "make <board>_defconfig" to do the board configuration.
It will create the .config file and additionally spl/.config, tpl/.config
if SPL, TPL is enabled, respectively.
You can use "make config", "make menuconfig" etc. to create
a new .config or modify the existing one.
Use "make spl/config", "make spl/menuconfig" etc. for spl/.config
and do likewise for tpl/.config file.
The generic syntax of configuration targets for SPL, TPL is:
<target_image>/<config_command>
Here, <target_image> is either 'spl' or 'tpl'
<config_command> is 'config', 'menuconfig', 'xconfig', etc.
When the configuration is done, run "make".
(Or "make <board>_defconfig all" will do the configuration and build
in one time.)
For futher information of how Kconfig works in U-Boot,
please read the comment block of scripts/multiconfig.py.
By the way, there is another item worth remarking here:
coexistence of Kconfig and board herder files.
Prior to Kconfig, we used C headers to define a set of configs.
We expect a very long term to migrate from C headers to Kconfig.
Two different infractructure must coexist in the interim.
In our former configuration scheme, include/autoconf.mk was generated
for use in makefiles.
It is still generated under include/, spl/include/, tpl/include/ directory
for the Normal, SPL, TPL image, respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
2014-07-30 05:08:17 +00:00
|
|
|
prefix := tpl
|
|
|
|
|
src := $(patsubst $(prefix)/%,%,$(obj))
|
|
|
|
|
ifeq ($(obj),$(src))
|
|
|
|
|
prefix := spl
|
|
|
|
|
src := $(patsubst $(prefix)/%,%,$(obj))
|
|
|
|
|
ifeq ($(obj),$(src))
|
|
|
|
|
prefix := .
|
|
|
|
|
endif
|
kbuild: use Linux Kernel build scripts
Now we are ready to switch over to real Kbuild.
This commit disables temporary scripts:
scripts/{Makefile.build.tmp, Makefile.host.tmp}
and enables real Kbuild scripts:
scripts/{Makefile.build,Makefile.host,Makefile.lib}.
This switch is triggered by the line in scripts/Kbuild.include
-build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj
+build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
We need to adjust some build scripts for U-Boot.
But smaller amount of modification is preferable.
Additionally, we need to fix compiler flags which are
locally added or removed.
In Kbuild, it is not allowed to change CFLAGS locally.
Instead, ccflags-y, asflags-y, cppflags-y,
CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).o
are prepared for that purpose.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Gerhard Sittig <gsi@denx.de>
2014-02-04 08:24:28 +00:00
|
|
|
endif
|
2022-04-30 06:56:52 +00:00
|
|
|
endif
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
PHONY := __build
|
|
|
|
|
__build:
|
|
|
|
|
|
|
|
|
|
# Init all relevant variables used in kbuild files so
|
|
|
|
|
# 1) they have correct type
|
|
|
|
|
# 2) they do not inherit any value from the environment
|
|
|
|
|
obj-y :=
|
|
|
|
|
obj-m :=
|
|
|
|
|
lib-y :=
|
|
|
|
|
lib-m :=
|
|
|
|
|
always :=
|
|
|
|
|
targets :=
|
|
|
|
|
subdir-y :=
|
|
|
|
|
subdir-m :=
|
|
|
|
|
EXTRA_AFLAGS :=
|
|
|
|
|
EXTRA_CFLAGS :=
|
|
|
|
|
EXTRA_CPPFLAGS :=
|
|
|
|
|
EXTRA_LDFLAGS :=
|
|
|
|
|
asflags-y :=
|
|
|
|
|
ccflags-y :=
|
|
|
|
|
cppflags-y :=
|
|
|
|
|
ldflags-y :=
|
|
|
|
|
|
|
|
|
|
subdir-asflags-y :=
|
|
|
|
|
subdir-ccflags-y :=
|
|
|
|
|
|
|
|
|
|
# Read auto.conf if it exists, otherwise ignore
|
kconfig: switch to Kconfig
This commit enables Kconfig.
Going forward, we use Kconfig for the board configuration.
mkconfig will never be used. Nor will include/config.mk be generated.
Kconfig must be adjusted for U-Boot because our situation is
a little more complicated than Linux Kernel.
We have to generate multiple boot images (Normal, SPL, TPL)
from one source tree.
Each image needs its own configuration input.
Usage:
Run "make <board>_defconfig" to do the board configuration.
It will create the .config file and additionally spl/.config, tpl/.config
if SPL, TPL is enabled, respectively.
You can use "make config", "make menuconfig" etc. to create
a new .config or modify the existing one.
Use "make spl/config", "make spl/menuconfig" etc. for spl/.config
and do likewise for tpl/.config file.
The generic syntax of configuration targets for SPL, TPL is:
<target_image>/<config_command>
Here, <target_image> is either 'spl' or 'tpl'
<config_command> is 'config', 'menuconfig', 'xconfig', etc.
When the configuration is done, run "make".
(Or "make <board>_defconfig all" will do the configuration and build
in one time.)
For futher information of how Kconfig works in U-Boot,
please read the comment block of scripts/multiconfig.py.
By the way, there is another item worth remarking here:
coexistence of Kconfig and board herder files.
Prior to Kconfig, we used C headers to define a set of configs.
We expect a very long term to migrate from C headers to Kconfig.
Two different infractructure must coexist in the interim.
In our former configuration scheme, include/autoconf.mk was generated
for use in makefiles.
It is still generated under include/, spl/include/, tpl/include/ directory
for the Normal, SPL, TPL image, respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
2014-07-30 05:08:17 +00:00
|
|
|
# Modified for U-Boot
|
kconfig: switch to single .config configuration
When Kconfig for U-boot was examined, one of the biggest issues was
how to support multiple images (Normal, SPL, TPL). There were
actually two options, "single .config" and "multiple .config".
After some discussions and thought experiments, I chose the latter,
i.e. to create ".config", "spl/.config", "tpl/.config" for Normal,
SPL, TPL, respectively.
It is true that the "multiple .config" strategy provided us the
maximum flexibility and helped to avoid duplicating CONFIGs among
Normal, SPL, TPL, but I have noticed some fatal problems:
[1] It is impossible to share CONFIG options across the images.
If you change the configuration of Main image, you often have to
adjust some SPL configurations correspondingly. Currently, we
cannot handle the dependencies between them. It means one of the
biggest advantages of Kconfig is lost.
[2] It is too painful to change both ".config" and "spl/.config".
Sunxi guys started to work around this problem by creating a new
configuration target. Commit cbdd9a9737cc (sunxi: kconfig: Add
%_felconfig rule to enable FEL build of sunxi platforms.) added
"make *_felconfig" to enable CONFIG_SPL_FEL on both images.
Changing the configuration of multiple images in one command is a
generic demand. The current implementation cannot propose any
good solution about this.
[3] Kconfig files are getting ugly and difficult to understand.
Commit b724bd7d6349 (dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to
Kconfig) has sprinkled "if !SPL_BUILD" over the Kconfig files.
[4] The build system got more complicated than it should be.
To adjust Linux-originated Kconfig to U-Boot, the helper script
"scripts/multiconfig.sh" was introduced. Writing a complicated
text processor is a shell script sometimes caused problems.
Now I believe the "single .config" will serve us better. With it,
all the problems above would go away. Instead, we will have to add
some CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM,
but we will not have much. Anyway, this is what we do now in
scripts/Makefile.spl.
I admit my mistake with my apology and this commit switches to the
single .config configuration.
It is not so difficult to do that:
- Remove unnecessary processings from scripts/multiconfig.sh
This file will remain for a while to support the current defconfig
format. It will be removed after more cleanups are done.
- Adjust some makefiles and Kconfigs
- Add some entries to include/config_uncmd_spl.h and the new file
scripts/Makefile.uncmd_spl. Some CONFIG options that are not
supported on SPL must be disabled because one .config is shared
between SPL and U-Boot proper going forward. I know this is not
a beautiful solution and I think we can do better, but let's see
how much we will have to describe them.
- update doc/README.kconfig
More cleaning up patches will follow this.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-02-24 13:26:20 +00:00
|
|
|
-include include/config/auto.conf
|
kconfig: switch to Kconfig
This commit enables Kconfig.
Going forward, we use Kconfig for the board configuration.
mkconfig will never be used. Nor will include/config.mk be generated.
Kconfig must be adjusted for U-Boot because our situation is
a little more complicated than Linux Kernel.
We have to generate multiple boot images (Normal, SPL, TPL)
from one source tree.
Each image needs its own configuration input.
Usage:
Run "make <board>_defconfig" to do the board configuration.
It will create the .config file and additionally spl/.config, tpl/.config
if SPL, TPL is enabled, respectively.
You can use "make config", "make menuconfig" etc. to create
a new .config or modify the existing one.
Use "make spl/config", "make spl/menuconfig" etc. for spl/.config
and do likewise for tpl/.config file.
The generic syntax of configuration targets for SPL, TPL is:
<target_image>/<config_command>
Here, <target_image> is either 'spl' or 'tpl'
<config_command> is 'config', 'menuconfig', 'xconfig', etc.
When the configuration is done, run "make".
(Or "make <board>_defconfig all" will do the configuration and build
in one time.)
For futher information of how Kconfig works in U-Boot,
please read the comment block of scripts/multiconfig.py.
By the way, there is another item worth remarking here:
coexistence of Kconfig and board herder files.
Prior to Kconfig, we used C headers to define a set of configs.
We expect a very long term to migrate from C headers to Kconfig.
Two different infractructure must coexist in the interim.
In our former configuration scheme, include/autoconf.mk was generated
for use in makefiles.
It is still generated under include/, spl/include/, tpl/include/ directory
for the Normal, SPL, TPL image, respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
2014-07-30 05:08:17 +00:00
|
|
|
-include $(prefix)/include/autoconf.mk
|
kconfig: switch to single .config configuration
When Kconfig for U-boot was examined, one of the biggest issues was
how to support multiple images (Normal, SPL, TPL). There were
actually two options, "single .config" and "multiple .config".
After some discussions and thought experiments, I chose the latter,
i.e. to create ".config", "spl/.config", "tpl/.config" for Normal,
SPL, TPL, respectively.
It is true that the "multiple .config" strategy provided us the
maximum flexibility and helped to avoid duplicating CONFIGs among
Normal, SPL, TPL, but I have noticed some fatal problems:
[1] It is impossible to share CONFIG options across the images.
If you change the configuration of Main image, you often have to
adjust some SPL configurations correspondingly. Currently, we
cannot handle the dependencies between them. It means one of the
biggest advantages of Kconfig is lost.
[2] It is too painful to change both ".config" and "spl/.config".
Sunxi guys started to work around this problem by creating a new
configuration target. Commit cbdd9a9737cc (sunxi: kconfig: Add
%_felconfig rule to enable FEL build of sunxi platforms.) added
"make *_felconfig" to enable CONFIG_SPL_FEL on both images.
Changing the configuration of multiple images in one command is a
generic demand. The current implementation cannot propose any
good solution about this.
[3] Kconfig files are getting ugly and difficult to understand.
Commit b724bd7d6349 (dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to
Kconfig) has sprinkled "if !SPL_BUILD" over the Kconfig files.
[4] The build system got more complicated than it should be.
To adjust Linux-originated Kconfig to U-Boot, the helper script
"scripts/multiconfig.sh" was introduced. Writing a complicated
text processor is a shell script sometimes caused problems.
Now I believe the "single .config" will serve us better. With it,
all the problems above would go away. Instead, we will have to add
some CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM,
but we will not have much. Anyway, this is what we do now in
scripts/Makefile.spl.
I admit my mistake with my apology and this commit switches to the
single .config configuration.
It is not so difficult to do that:
- Remove unnecessary processings from scripts/multiconfig.sh
This file will remain for a while to support the current defconfig
format. It will be removed after more cleanups are done.
- Adjust some makefiles and Kconfigs
- Add some entries to include/config_uncmd_spl.h and the new file
scripts/Makefile.uncmd_spl. Some CONFIG options that are not
supported on SPL must be disabled because one .config is shared
between SPL and U-Boot proper going forward. I know this is not
a beautiful solution and I think we can do better, but let's see
how much we will have to describe them.
- update doc/README.kconfig
More cleaning up patches will follow this.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2015-02-24 13:26:20 +00:00
|
|
|
include scripts/Makefile.uncmd_spl
|
2014-02-04 08:24:32 +00:00
|
|
|
|
2014-02-04 08:24:27 +00:00
|
|
|
include scripts/Kbuild.include
|
|
|
|
|
|
|
|
|
|
# The filename Kbuild has precedence over Makefile
|
|
|
|
|
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
|
|
|
|
|
kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
|
|
|
|
|
include $(kbuild-file)
|
|
|
|
|
|
2014-03-05 07:59:40 +00:00
|
|
|
# Added for U-Boot
|
|
|
|
|
asflags-y += $(PLATFORM_CPPFLAGS)
|
|
|
|
|
ccflags-y += $(PLATFORM_CPPFLAGS)
|
|
|
|
|
cppflags-y += $(PLATFORM_CPPFLAGS)
|
|
|
|
|
|
2014-02-04 08:24:27 +00:00
|
|
|
include scripts/Makefile.lib
|
|
|
|
|
|
|
|
|
|
# Do not include host rules unless needed
|
2020-03-27 15:46:27 +00:00
|
|
|
ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
|
2014-02-04 08:24:27 +00:00
|
|
|
include scripts/Makefile.host
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifndef obj
|
|
|
|
|
$(warning kbuild: Makefile.build is included improperly)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# ===========================================================================
|
|
|
|
|
|
2014-10-30 02:06:13 +00:00
|
|
|
ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)
|
2014-02-04 08:24:27 +00:00
|
|
|
lib-target := $(obj)/lib.a
|
|
|
|
|
endif
|
|
|
|
|
|
2014-10-30 02:06:13 +00:00
|
|
|
ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),)
|
2014-02-04 08:24:27 +00:00
|
|
|
builtin-target := $(obj)/built-in.o
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
modorder-target := $(obj)/modules.order
|
|
|
|
|
|
|
|
|
|
# We keep a list of all modules in $(MODVERDIR)
|
|
|
|
|
|
|
|
|
|
__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
|
|
|
|
|
$(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \
|
|
|
|
|
$(subdir-ym) $(always)
|
|
|
|
|
@:
|
|
|
|
|
|
|
|
|
|
# Linus' kernel sanity checking tool
|
2021-06-17 22:07:25 +00:00
|
|
|
ifeq ($(KBUILD_CHECKSRC),1)
|
|
|
|
|
quiet_cmd_checksrc = CHECK $<
|
|
|
|
|
cmd_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
|
|
|
|
|
else ifeq ($(KBUILD_CHECKSRC),2)
|
|
|
|
|
quiet_cmd_force_checksrc = CHECK $<
|
|
|
|
|
cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
|
2014-02-04 08:24:27 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Do section mismatch analysis for each module/built-in.o
|
|
|
|
|
ifdef CONFIG_DEBUG_SECTION_MISMATCH
|
|
|
|
|
cmd_secanalysis = ; scripts/mod/modpost $@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Compile C sources (.c)
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# Default is built-in, unless we know otherwise
|
|
|
|
|
modkern_cflags = \
|
|
|
|
|
$(if $(part-of-module), \
|
|
|
|
|
$(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
|
|
|
|
|
$(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
|
|
|
|
|
quiet_modtag := $(empty) $(empty)
|
|
|
|
|
|
|
|
|
|
$(real-objs-m) : part-of-module := y
|
|
|
|
|
$(real-objs-m:.o=.i) : part-of-module := y
|
|
|
|
|
$(real-objs-m:.o=.s) : part-of-module := y
|
|
|
|
|
$(real-objs-m:.o=.lst): part-of-module := y
|
|
|
|
|
|
|
|
|
|
$(real-objs-m) : quiet_modtag := [M]
|
|
|
|
|
$(real-objs-m:.o=.i) : quiet_modtag := [M]
|
|
|
|
|
$(real-objs-m:.o=.s) : quiet_modtag := [M]
|
|
|
|
|
$(real-objs-m:.o=.lst): quiet_modtag := [M]
|
|
|
|
|
|
|
|
|
|
$(obj-m) : quiet_modtag := [M]
|
|
|
|
|
|
|
|
|
|
# Default for not multi-part modules
|
|
|
|
|
modname = $(basetarget)
|
|
|
|
|
|
|
|
|
|
$(multi-objs-m) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-m:.o=.i) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-m:.o=.s) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-m:.o=.lst) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-y) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-y:.o=.i) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-y:.o=.s) : modname = $(modname-multi)
|
|
|
|
|
$(multi-objs-y:.o=.lst) : modname = $(modname-multi)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
|
2014-04-15 04:29:00 +00:00
|
|
|
cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
$(obj)/%.s: $(src)/%.c FORCE
|
|
|
|
|
$(call if_changed_dep,cc_s_c)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
|
|
|
|
|
cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
|
|
|
|
|
|
|
|
|
|
$(obj)/%.i: $(src)/%.c FORCE
|
|
|
|
|
$(call if_changed_dep,cc_i_c)
|
|
|
|
|
|
|
|
|
|
cmd_gensymtypes = \
|
|
|
|
|
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
|
|
|
|
|
$(GENKSYMS) $(if $(1), -T $(2)) \
|
|
|
|
|
$(if $(KBUILD_PRESERVE),-p) \
|
|
|
|
|
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
|
|
|
|
|
|
|
|
|
quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
|
|
|
|
|
cmd_cc_symtypes_c = \
|
|
|
|
|
set -e; \
|
|
|
|
|
$(call cmd_gensymtypes,true,$@) >/dev/null; \
|
|
|
|
|
test -s $@ || rm -f $@
|
|
|
|
|
|
|
|
|
|
$(obj)/%.symtypes : $(src)/%.c FORCE
|
|
|
|
|
$(call cmd,cc_symtypes_c)
|
|
|
|
|
|
|
|
|
|
# C (.c) files
|
|
|
|
|
# The C file is compiled and updated dependency information is generated.
|
|
|
|
|
# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_cc_o_c = CC $(quiet_modtag) $@
|
|
|
|
|
|
|
|
|
|
ifndef CONFIG_MODVERSIONS
|
|
|
|
|
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
# When module versioning is enabled the following steps are executed:
|
|
|
|
|
# o compile a .tmp_<file>.o from <file>.c
|
|
|
|
|
# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
|
|
|
|
|
# not export symbols, we just rename .tmp_<file>.o to <file>.o and
|
|
|
|
|
# are done.
|
|
|
|
|
# o otherwise, we calculate symbol versions using the good old
|
|
|
|
|
# genksyms on the preprocessed source and postprocess them in a way
|
|
|
|
|
# that they are usable as a linker script
|
|
|
|
|
# o generate <file>.o from .tmp_<file>.o using the linker to
|
|
|
|
|
# replace the unresolved symbols __crc_exported_symbol with
|
|
|
|
|
# the actual value of the checksum generated by genksyms
|
|
|
|
|
|
|
|
|
|
cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
|
|
|
|
|
cmd_modversions = \
|
|
|
|
|
if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \
|
|
|
|
|
$(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
|
|
|
|
|
> $(@D)/.tmp_$(@F:.o=.ver); \
|
|
|
|
|
\
|
2020-03-27 15:46:27 +00:00
|
|
|
$(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \
|
2014-02-04 08:24:27 +00:00
|
|
|
-T $(@D)/.tmp_$(@F:.o=.ver); \
|
|
|
|
|
rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \
|
|
|
|
|
else \
|
|
|
|
|
mv -f $(@D)/.tmp_$(@F) $@; \
|
|
|
|
|
fi;
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef CONFIG_FTRACE_MCOUNT_RECORD
|
2020-03-11 22:11:17 +00:00
|
|
|
# gcc 5 supports generating the mcount tables directly
|
|
|
|
|
ifneq ($(call cc-option,-mrecord-mcount,y),y)
|
|
|
|
|
KBUILD_CFLAGS += -mrecord-mcount
|
|
|
|
|
else
|
|
|
|
|
# else do it all manually
|
2014-02-04 08:24:27 +00:00
|
|
|
ifdef BUILD_C_RECORDMCOUNT
|
|
|
|
|
ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
|
|
|
|
|
RECORDMCOUNT_FLAGS = -w
|
|
|
|
|
endif
|
|
|
|
|
# Due to recursion, we must skip empty.o.
|
|
|
|
|
# The empty.o file is created in the make process in order to determine
|
|
|
|
|
# the target endianness and word size. It is made before all other C
|
|
|
|
|
# files, including recordmcount.
|
|
|
|
|
sub_cmd_record_mcount = \
|
|
|
|
|
if [ $(@) != "scripts/mod/empty.o" ]; then \
|
|
|
|
|
$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
|
|
|
|
|
fi;
|
|
|
|
|
recordmcount_source := $(srctree)/scripts/recordmcount.c \
|
|
|
|
|
$(srctree)/scripts/recordmcount.h
|
|
|
|
|
else
|
|
|
|
|
sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
|
|
|
|
|
"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
|
|
|
|
|
"$(if $(CONFIG_64BIT),64,32)" \
|
2020-03-27 15:46:27 +00:00
|
|
|
"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
|
|
|
|
|
"$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
|
2014-02-04 08:24:27 +00:00
|
|
|
"$(if $(part-of-module),1,0)" "$(@)";
|
|
|
|
|
recordmcount_source := $(srctree)/scripts/recordmcount.pl
|
|
|
|
|
endif
|
2015-07-04 16:56:55 +00:00
|
|
|
cmd_record_mcount = \
|
|
|
|
|
if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" = \
|
|
|
|
|
"$(CC_FLAGS_FTRACE)" ]; then \
|
2014-02-04 08:24:27 +00:00
|
|
|
$(sub_cmd_record_mcount) \
|
|
|
|
|
fi;
|
2020-03-11 22:11:17 +00:00
|
|
|
endif # -record-mcount
|
2014-02-04 08:24:27 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
define rule_cc_o_c
|
|
|
|
|
$(call echo-cmd,checksrc) $(cmd_checksrc) \
|
|
|
|
|
$(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
|
|
|
|
|
$(cmd_modversions) \
|
|
|
|
|
$(call echo-cmd,record_mcount) \
|
|
|
|
|
$(cmd_record_mcount) \
|
|
|
|
|
scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
|
|
|
|
|
$(dot-target).tmp; \
|
|
|
|
|
rm -f $(depfile); \
|
|
|
|
|
mv -f $(dot-target).tmp $(dot-target).cmd
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
# Built-in and composite module parts
|
|
|
|
|
$(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
|
|
|
|
|
$(call cmd,force_checksrc)
|
|
|
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
|
|
|
|
|
|
# Single-part modules are special since we need to mark them in $(MODVERDIR)
|
|
|
|
|
|
|
|
|
|
$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
|
|
|
|
|
$(call cmd,force_checksrc)
|
|
|
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
|
@{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_cc_lst_c = MKLST $@
|
|
|
|
|
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
|
|
|
|
|
$(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \
|
|
|
|
|
System.map $(OBJDUMP) > $@
|
|
|
|
|
|
|
|
|
|
$(obj)/%.lst: $(src)/%.c FORCE
|
|
|
|
|
$(call if_changed_dep,cc_lst_c)
|
|
|
|
|
|
|
|
|
|
# Compile assembler sources (.S)
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
|
|
|
|
|
|
|
|
|
|
$(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
|
|
|
|
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
2014-06-16 09:56:38 +00:00
|
|
|
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
$(obj)/%.s: $(src)/%.S FORCE
|
|
|
|
|
$(call if_changed_dep,as_s_S)
|
|
|
|
|
|
|
|
|
|
quiet_cmd_as_o_S = AS $(quiet_modtag) $@
|
|
|
|
|
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
|
|
|
|
|
|
|
|
|
|
$(obj)/%.o: $(src)/%.S FORCE
|
|
|
|
|
$(call if_changed_dep,as_o_S)
|
|
|
|
|
|
|
|
|
|
targets += $(real-objs-y) $(real-objs-m) $(lib-y)
|
|
|
|
|
targets += $(extra-y) $(MAKECMDGOALS) $(always)
|
|
|
|
|
|
|
|
|
|
# Linker scripts preprocessor (.lds.S -> .lds)
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
quiet_cmd_cpp_lds_S = LDS $@
|
|
|
|
|
cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
|
|
|
|
|
-D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
|
|
|
|
|
|
|
|
|
|
$(obj)/%.lds: $(src)/%.lds.S FORCE
|
|
|
|
|
$(call if_changed_dep,cpp_lds_S)
|
|
|
|
|
|
|
|
|
|
# ASN.1 grammar
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
quiet_cmd_asn1_compiler = ASN.1 $@
|
2019-11-13 00:44:53 +00:00
|
|
|
cmd_asn1_compiler = $(objtree)/tools/asn1_compiler $< \
|
2014-02-04 08:24:27 +00:00
|
|
|
$(subst .h,.c,$@) $(subst .c,.h,$@)
|
|
|
|
|
|
2019-11-13 00:44:53 +00:00
|
|
|
$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/tools/asn1_compiler
|
2014-02-04 08:24:27 +00:00
|
|
|
$(call cmd,asn1_compiler)
|
|
|
|
|
|
|
|
|
|
# Build the compiled-in targets
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# To build objects in subdirs, we need to descend into the directories
|
|
|
|
|
$(sort $(subdir-obj-y)): $(subdir-ym) ;
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Rule to compile a set of .o files into one .o file
|
|
|
|
|
#
|
|
|
|
|
ifdef builtin-target
|
2021-05-20 11:24:02 +00:00
|
|
|
quiet_cmd_link_o_target = AR $@
|
2014-02-04 08:24:27 +00:00
|
|
|
# If the list of objects to link is empty, just create an empty built-in.o
|
|
|
|
|
cmd_link_o_target = $(if $(strip $(obj-y)),\
|
2021-05-20 11:24:02 +00:00
|
|
|
rm -f $@; $(AR) cDPrsT $@ $(filter $(obj-y), $^), \
|
|
|
|
|
rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@)
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
$(builtin-target): $(obj-y) FORCE
|
|
|
|
|
$(call if_changed,link_o_target)
|
|
|
|
|
|
|
|
|
|
targets += $(builtin-target)
|
|
|
|
|
endif # builtin-target
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Rule to create modules.order file
|
|
|
|
|
#
|
|
|
|
|
# Create commands to either record .ko file or cat modules.order from
|
|
|
|
|
# a subdirectory
|
|
|
|
|
modorder-cmds = \
|
|
|
|
|
$(foreach m, $(modorder), \
|
|
|
|
|
$(if $(filter %/modules.order, $m), \
|
|
|
|
|
cat $m;, echo kernel/$m;))
|
|
|
|
|
|
|
|
|
|
$(modorder-target): $(subdir-ym) FORCE
|
|
|
|
|
$(Q)(cat /dev/null; $(modorder-cmds)) > $@
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Rule to compile a set of .o files into one .a file
|
|
|
|
|
#
|
|
|
|
|
ifdef lib-target
|
|
|
|
|
quiet_cmd_link_l_target = AR $@
|
2021-05-20 11:24:02 +00:00
|
|
|
cmd_link_l_target = rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(lib-y)
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
$(lib-target): $(lib-y) FORCE
|
|
|
|
|
$(call if_changed,link_l_target)
|
|
|
|
|
|
|
|
|
|
targets += $(lib-target)
|
|
|
|
|
endif
|
|
|
|
|
|
2021-05-20 11:24:02 +00:00
|
|
|
quiet_cmd_link_multi-y = AR $@
|
2021-06-17 22:07:25 +00:00
|
|
|
cmd_link_multi-y = rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(filter %.o,$^)
|
2021-05-20 11:24:02 +00:00
|
|
|
|
|
|
|
|
quiet_cmd_link_multi-m = AR [M] $@
|
2014-02-04 08:24:27 +00:00
|
|
|
cmd_link_multi-m = $(cmd_link_multi-y)
|
|
|
|
|
|
2014-10-30 02:06:10 +00:00
|
|
|
$(multi-used-y): FORCE
|
2014-02-04 08:24:27 +00:00
|
|
|
$(call if_changed,link_multi-y)
|
2014-10-30 02:06:10 +00:00
|
|
|
$(call multi_depend, $(multi-used-y), .o, -objs -y)
|
2014-02-04 08:24:27 +00:00
|
|
|
|
2014-10-30 02:06:10 +00:00
|
|
|
$(multi-used-m): FORCE
|
2014-02-04 08:24:27 +00:00
|
|
|
$(call if_changed,link_multi-m)
|
2021-06-17 22:07:25 +00:00
|
|
|
@{ echo $(@:.o=.ko); echo $(filter %.o,$^); } > $(MODVERDIR)/$(@F:.o=.mod)
|
2014-10-30 02:06:10 +00:00
|
|
|
$(call multi_depend, $(multi-used-m), .o, -objs -y)
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
targets += $(multi-used-y) $(multi-used-m)
|
|
|
|
|
|
|
|
|
|
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
# Add intermediate targets:
|
|
|
|
|
# When building objects with specific suffix patterns, add intermediate
|
|
|
|
|
# targets that the final targets are derived from.
|
|
|
|
|
intermediate_targets = $(foreach sfx, $(2), \
|
|
|
|
|
$(patsubst %$(strip $(1)),%$(sfx), \
|
|
|
|
|
$(filter %$(strip $(1)), $(targets))))
|
|
|
|
|
# %.lex.o <- %.lex.c <- %.l
|
|
|
|
|
# %.tab.o <- %.tab.[ch] <- %.y
|
2019-11-13 00:45:01 +00:00
|
|
|
targets += $(call intermediate_targets, .lex.o, .lex.c) \
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
$(call intermediate_targets, .tab.o, .tab.c .tab.h)
|
|
|
|
|
|
2014-02-04 08:24:27 +00:00
|
|
|
# Descending
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
PHONY += $(subdir-ym)
|
|
|
|
|
$(subdir-ym):
|
|
|
|
|
$(Q)$(MAKE) $(build)=$@
|
|
|
|
|
|
|
|
|
|
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
PHONY += FORCE
|
|
|
|
|
|
|
|
|
|
FORCE:
|
|
|
|
|
|
|
|
|
|
# Read all saved command lines and dependencies for the $(targets) we
|
|
|
|
|
# may be building above, using $(if_changed{,_dep}). As an
|
|
|
|
|
# optimization, we don't need to read them if the target does not
|
|
|
|
|
# exist, we will rebuild anyway in that case.
|
|
|
|
|
|
2020-04-17 07:21:36 +00:00
|
|
|
cmd_files := $(wildcard $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd))
|
2014-02-04 08:24:27 +00:00
|
|
|
|
|
|
|
|
ifneq ($(cmd_files),)
|
|
|
|
|
include $(cmd_files)
|
|
|
|
|
endif
|
|
|
|
|
|
2020-04-17 07:21:36 +00:00
|
|
|
# Create directories for object files if they do not exist
|
|
|
|
|
obj-dirs := $(sort $(obj) $(patsubst %/,%, $(dir $(targets))))
|
|
|
|
|
$(shell mkdir -p $(obj-dirs))
|
|
|
|
|
|
2014-02-04 08:24:27 +00:00
|
|
|
.PHONY: $(PHONY)
|
