[coreboot-gerrit] New patch to review for coreboot: build system: remove early stage cbfs-file sorting

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16138

-gerrit

commit dbf58148c93c396ec249fff016f92fd58ad04a3b
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Wed Aug 10 13:29:03 2016 +0200

    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 at chromium.org>
---
 Makefile.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 52b91ab..c16657e 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -297,17 +297,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:=) \
@@ -656,8 +651,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)))