diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-08-10 13:29:03 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-08-11 20:31:48 +0200 |
| commit | 5986d2972aac8847ded509a3e2cac07d9fee2d11 (patch) | |
| tree | ab1e4c65ccb690acaeadb0adbbf75604f0e20246 | |
| parent | 513693ca3a5ee101636baaa0b8e2ea25fba19538 (diff) | |
build system: remove early stage cbfs-file sorting
They're now sorted later in the process after the per-region file lists
are determined.
Change-Id: I0bba381d09dc4b99e2fe5cae16ff7ffcb5b3aa82
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/16138
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | Makefile.inc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.inc b/Makefile.inc index 3852132201..37cc60c665 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -298,17 +298,12 @@ cbfs-files-handler= \ $(info ERROR: It is not allowed to specify both alignment and position for $($(2)-file)) \ $(eval FAILBUILD:=1) \ )) \ - $(eval _cbfs-bucket:=regular ) \ - $(if $(strip $($(2)-position)), \ - $(eval _cbfs-bucket:=fixed)) \ - $(if $(strip $($(2)-align)), \ - $(eval _cbfs-bucket:=aligned)) \ $(if $(tmp-cbfs-method), \ $(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \ $(eval tmp-cbfs-file:=$(shell mkdir -p $(obj)/mainboard/$(MAINBOARDDIR); mktemp $(obj)/mainboard/$(MAINBOARDDIR)/cbfs-file.XXXXXX).out) \ $(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \ $(if $(tmp-cbfs-file), \ - $(eval cbfs-files-$(_cbfs-bucket) += $(subst $(spc),*,$(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align)|$($(2)-options)))) \ + $(eval cbfs-files += $(subst $(spc),*,$(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align)|$($(2)-options)))) \ $(eval $(2)-name:=) \ $(eval $(2)-type:=) \ $(eval $(2)-compression:=) \ @@ -657,8 +652,6 @@ define cbfs-add-cmd $(call cbfs-add-cmd-for-region,$(1),$(2)) endef -cbfs-files=$(cbfs-files-fixed) $(cbfs-files-aligned) $(cbfs-files-regular) - # list of files to add (using their file system names, not CBFS names), # for dependencies etc. prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) |