projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: arm64: rk3399: add SPL support
[oweals/u-boot.git]
/
scripts
/
Makefile.build
diff --git
a/scripts/Makefile.build
b/scripts/Makefile.build
index 6742ddd0b80fd8bd5f418a148b848fd2199427b0..06e5c203c1f13bd4428ef16c2151e9345e07c0ef 100644
(file)
--- a/
scripts/Makefile.build
+++ b/
scripts/Makefile.build
@@
-1,6
+1,9
@@
# ==========================================================================
# Building
# ==========================================================================
# ==========================================================================
# Building
# ==========================================================================
+#
+# SPDX-License-Identifier: GPL-2.0
+#
# Modified for U-Boot
prefix := tpl
# Modified for U-Boot
prefix := tpl
@@
-41,8
+44,9
@@
subdir-ccflags-y :=
# Read auto.conf if it exists, otherwise ignore
# Modified for U-Boot
# Read auto.conf if it exists, otherwise ignore
# Modified for U-Boot
--include
$(prefix)/
include/config/auto.conf
+-include include/config/auto.conf
-include $(prefix)/include/autoconf.mk
-include $(prefix)/include/autoconf.mk
+include scripts/Makefile.uncmd_spl
include scripts/Kbuild.include
include scripts/Kbuild.include
@@
-97,11
+101,11
@@
endif
# ===========================================================================
# ===========================================================================
-ifneq ($(strip $(lib-y) $(lib-m) $(lib-
n) $(lib-
)),)
+ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)
lib-target := $(obj)/lib.a
endif
lib-target := $(obj)/lib.a
endif
-ifneq ($(strip $(obj-y) $(obj-m) $(obj-
n) $(obj-
) $(subdir-m) $(lib-target)),)
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),)
builtin-target := $(obj)/built-in.o
endif
builtin-target := $(obj)/built-in.o
endif
@@
-252,8
+256,9
@@
sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
"$(if $(part-of-module),1,0)" "$(@)";
recordmcount_source := $(srctree)/scripts/recordmcount.pl
endif
"$(if $(part-of-module),1,0)" "$(@)";
recordmcount_source := $(srctree)/scripts/recordmcount.pl
endif
-cmd_record_mcount = \
- if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \
+cmd_record_mcount = \
+ if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" = \
+ "$(CC_FLAGS_FTRACE)" ]; then \
$(sub_cmd_record_mcount) \
fi;
endif
$(sub_cmd_record_mcount) \
fi;
endif
@@
-400,16
+405,14
@@
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalys
quiet_cmd_link_multi-m = LD [M] $@
cmd_link_multi-m = $(cmd_link_multi-y)
quiet_cmd_link_multi-m = LD [M] $@
cmd_link_multi-m = $(cmd_link_multi-y)
-# We would rather have a list of rules like
-# foo.o: $(foo-objs)
-# but that's not so easy, so we rather make all composite objects depend
-# on the set of all their parts
-$(multi-used-y) : %.o: $(multi-objs-y) FORCE
+$(multi-used-y): FORCE
$(call if_changed,link_multi-y)
$(call if_changed,link_multi-y)
+$(call multi_depend, $(multi-used-y), .o, -objs -y)
-$(multi-used-m)
: %.o: $(multi-objs-m)
FORCE
+$(multi-used-m)
:
FORCE
$(call if_changed,link_multi-m)
@{ echo $(@:.o=.ko); echo $(link_multi_deps); } > $(MODVERDIR)/$(@F:.o=.mod)
$(call if_changed,link_multi-m)
@{ echo $(@:.o=.ko); echo $(link_multi_deps); } > $(MODVERDIR)/$(@F:.o=.mod)
+$(call multi_depend, $(multi-used-m), .o, -objs -y)
targets += $(multi-used-y) $(multi-used-m)
targets += $(multi-used-y) $(multi-used-m)