diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-17 09:54:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-17 09:54:45 -0400 |
| commit | 552c3d4c2d3a98658158fdb7213515d631f5e181 (patch) | |
| tree | 8f69c23d27d458081fd3e3dc9d244cd92ad05c96 /scripts/Kbuild.include | |
| parent | e24f0a39d0daa2d8c597650aeb3f559d44a195ae (diff) | |
| parent | 33b40389ea4a3c19a00ff63dafa3ba61d18ef0d9 (diff) | |
| download | u-boot-552c3d4c2d3a98658158fdb7213515d631f5e181.tar.gz u-boot-552c3d4c2d3a98658158fdb7213515d631f5e181.tar.xz u-boot-552c3d4c2d3a98658158fdb7213515d631f5e181.zip | |
Merge branch '2020-03-16-kbuild-etc-resync-v4.18' into next
- Update our Kbuild / Kconfig and relate functionality to be in line
with the Linux kernel v4.18 release.
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b8969e2a75..c7ad187777 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -54,7 +54,6 @@ kecho := $($(quiet)kecho) # to specify a valid file as first prerequisite (often the kbuild file) define filechk $(Q)set -e; \ - $(kecho) ' CHK $@'; \ mkdir -p $(dir $@); \ $(filechk_$(1)) < $< > $@.tmp; \ if [ -r $@ ] && cmp -s $@ $@.tmp; then \ @@ -121,11 +120,6 @@ cc-option = $(call try-run,\ cc-option-yn = $(call try-run,\ $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n) -# cc-option-align -# Prefix align with either -falign or -malign -cc-option-align = $(subst -functions=0,,\ - $(call cc-option,-falign-functions=0,-malign-functions=0)) - # cc-disable-warning # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable) cc-disable-warning = $(call try-run,\ @@ -148,7 +142,6 @@ cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) # added for U-Boot binutils-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/binutils-version.sh $(AS)) -dtc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/dtc-version.sh $(DTC)) # cc-ldoption # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) @@ -208,7 +201,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ -$(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)) +$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1)) # Find all -I options and call addtree flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) |