[coreboot-gerrit] New patch to review for coreboot: 77f9c8b Revert "build system: allow defining alignment for cbfs-files"
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Tue Dec 23 15:10:10 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 77f9c8b8033711d6a23c935c99fa20974dd61727
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Dec 23 15:10:08 2014 +0100
Revert "build system: allow defining alignment for cbfs-files"
This reverts commit 5839635add286ff7307a06486d2d49b46e14ec7b.
Chnage broke cbfs-file-position, probably resulting with non-booting Intel platforms using mrc.bin and risk of corrupting cbfs on AGESA with HAVE_ACPI_RESUME wiping flash at wrong place.
Change-Id: I6ca7a3cdf8dfe40bf47da6c6071ef7b1f42a32b4
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
Makefile.inc | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index c9da7f8..880c38d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -208,22 +208,16 @@ cbfs-files-handler= \
$(info This build configuration requires $($(2)-required)) \
$(eval FAILBUILD:=1) \
)) \
- $(if $(strip $($(2)-align)), \
- $(if $(strip $($(2)-position)), \
- $(info ERROR: It is not allowed to specify both alignment and position for $($(2)-file)) \
- $(eval FAILBUILD:=1) \
- )) \
$(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))) \
- $(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)|$($(2)-position)) \
$(eval $(2)-name:=) \
$(eval $(2)-type:=) \
$(eval $(2)-compression:=) \
$(eval $(2)-position:=) \
- $(eval $(2)-required:=) \
- $(eval $(2)-align:=)
+ $(eval $(2)-required:=)
#######################################################################
# a variety of flags for our build
@@ -515,20 +509,16 @@ ifeq ($(CONFIG_PAYLOAD_GRUB2),y)
COREBOOT_ROM_DEPENDENCIES+=grub2
endif
-extract_nth=$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-)))
-
-cbfs-add-cmd = \
- $(CBFSTOOL) $@.tmp \
- add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage)$(if $(filter payload,$(call extract_nth,3,$(file))),-payload) \
- -f $(call extract_nth,1,$(file)) \
- -n $(call extract_nth,2,$(file)) $(if $(filter-out stage,$(call extract_nth,3,$(file))),-t $(call extract_nth,3,$(file)))
+extract_nth=$(word $(1), $(subst |, ,$(2)))
ifneq ($(CONFIG_UPDATE_IMAGE),y)
prebuild-files = \
$(foreach file,$(cbfs-files), \
- $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \
- $(cbfs-add-cmd) -b {} &&,\
- $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&))
+ $(CBFSTOOL) $@.tmp \
+ add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage)$(if $(filter payload,$(call extract_nth,3,$(file))),-payload) \
+ -f $(call extract_nth,1,$(file)) \
+ -n $(call extract_nth,2,$(file)) $(if $(filter-out stage,$(call extract_nth,3,$(file))),-t $(call extract_nth,3,$(file))) \
+ $(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $$(cpu_ucode_cbfs_file)
More information about the coreboot-gerrit
mailing list