[coreboot-gerrit] Patch set updated for coreboot: f602786 build system: Fix regression after adding cbfs-files alignment

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Wed Dec 24 05:08:12 CET 2014


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7920

-gerrit

commit f602786a79d09f2d2fb80946be1a74d206152d88
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Tue Dec 23 15:10:08 2014 +0100

    build system: Fix regression after adding cbfs-files alignment
    
    Commit 5839635a broke cbfs file-position, probably resulting with
    non-booting Intel platforms using mrc.bin and the risk of AGESA
    with HAVE_ACPI_RESUME corrupting cbfs as s3nv.bin was not properly
    located.
    
    Change-Id: I6ca7a3cdf8dfe40bf47da6c6071ef7b1f42a32b4
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index c9da7f8..b1df7c5 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -217,7 +217,7 @@ cbfs-files-handler= \
 			$(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))) \
-		$(eval cbfs-files += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(split $($(2)-position))|$($(2)-align))\
+		$(eval cbfs-files += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))\
 		$(eval $(2)-name:=) \
 		$(eval $(2)-type:=) \
 		$(eval $(2)-compression:=) \



More information about the coreboot-gerrit mailing list