diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2016-03-31 13:08:42 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-04-05 13:37:11 +0200 |
| commit | fcc434764deff0eeb17e86a775f4d3da71d28a86 (patch) | |
| tree | 4023593d56d90ade0783dfe7059ae4debc3eda46 /src/vendorcode/google | |
| parent | 85cc5fdc4ab385a092be49fe137b96f62d6f2d42 (diff) | |
chromeos: Fix adding a bmpblk to GBB
The codepath was untested and incomplete. It now determines the right
GBB region sizes and puts the data in.
BUG=chromium:595715
BRANCH=none
TEST=none
Change-Id: I2cc47ddd8aa7675375ca5ed5f75632c30c65dd1e
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 36e026404ed049d61b677ef043a781c8c209dd93
Original-Change-Id: Ib872627740dbd8ac19fc3e2a01464457f38366ed
Original-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/336358
Original-Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Original-Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/14239
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/vendorcode/google')
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 43258d0bd4..0ae6fb0429 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -91,11 +91,12 @@ GBB_FLAGS := $(call int-add, \ ) ifneq ($(CONFIG_GBB_BMPFV_FILE),) -$(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY) +$(obj)/gbb.sizetmp: $(obj)/coreboot.rom + $(CBFSTOOL) $< read -r GBB -f $@ + +$(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY) $(obj)/gbb.sizetmp @printf " CREATE GBB (with BMPFV)\n" - $(CBFSTOOL) $< read -r GBB -f $(obj)/gbb.stub.tmp - $(FUTILITY) gbb_utility -c 0x100,0x1000,$(call int-subtract $(call file-size,$(obj)/gbb.stub.tmp) 0x2180),0x1000 $@.tmp - rm -f $(obj)/gbb.stub.tmp + $(FUTILITY) gbb_utility -c 0x100,0x1000,$(call int-subtract,$(call file-size,$(obj)/gbb.sizetmp) 0x2180),0x1000 $@.tmp mv $@.tmp $@ else $(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY) @@ -113,6 +114,11 @@ $(obj)/gbb.region: $(obj)/gbb.stub --recoverykey="$(CONFIG_VBOOT_RECOVERY_KEY)" \ --flags=$(GBB_FLAGS) \ $@.tmp +ifneq ($(CONFIG_GBB_BMPFV_FILE),) + $(FUTILITY) gbb_utility -s \ + --bmpfv="$(CONFIG_GBB_BMPFV_FILE)" \ + $@.tmp +endif mv $@.tmp $@ build_complete:: $(obj)/gbb.region |