GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2016-08-10 13:29:03 +02:00 committed by Patrick Georgi
parent 513693ca3a
commit 5986d2972a
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc
View File

@ -298,17 +298,12 @@ cbfs-files-handler= \
$(info ERROR: It is not allowed to specify both alignment and position for $($(2)-file)) \ $(info ERROR: It is not allowed to specify both alignment and position for $($(2)-file)) \
$(eval FAILBUILD:=1) \ $(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), \ $(if $(tmp-cbfs-method), \
$(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \ $(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) \ $(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))) \ $(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \
$(if $(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)-name:=) \
$(eval $(2)-type:=) \ $(eval $(2)-type:=) \
$(eval $(2)-compression:=) \ $(eval $(2)-compression:=) \
@ -657,8 +652,6 @@ define cbfs-add-cmd
$(call cbfs-add-cmd-for-region,$(1),$(2)) $(call cbfs-add-cmd-for-region,$(1),$(2))
endef 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), # list of files to add (using their file system names, not CBFS names),
# for dependencies etc. # for dependencies etc.
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))