diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2015-01-27 17:28:18 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-13 12:23:20 +0200 |
| commit | c8603157070bbcecc9eabc04a00cb2f1f54185b1 (patch) | |
| tree | ae080d32723e7d9dc54240f1173f9b8670d147b0 | |
| parent | 4f928444812f5ed2aa810d08ec603b859a6d63c0 (diff) | |
| download | coreboot-c8603157070bbcecc9eabc04a00cb2f1f54185b1.tar.xz | |
The vboot_reference fwlib2 target has changed to fwlib20
There are multiple vboot APIs (1.0, 2.0, 2.1). We have to be
explicit about which library we want to link with.
When building firmware, the vboot_reference Makefile should be
invoked in one of three ways:
TARGET OUTPUT VERSION
fwlib vboot_fw.a 1.0
fwlib20 vboot_fw20.a 2.0
fwlib21 vboot_fw21.a 2.1
BUG=chromium:228932
BRANCH=ToT
CQ-DEPEND=CL:243980
TEST=manual
emerge-veyron_pinky vboot_reference coreboot
emerge-samus vboot_reference coreboot
emerge-daisy_spring vboot_reference chromeos-u-boot
Change-Id: I7dde513c49b8148bf46e8768ae438e1a85af4243
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: 5e339cadad4815f061d4e5e20a9c9733f64cc90b
Original-Change-Id: I850646117211930d9215693c48f2c30d55a984d3
Original-Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/243981
Original-Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: http://review.coreboot.org/9564
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/Makefile.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc index a29b462842..12404d967f 100644 --- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc @@ -34,7 +34,7 @@ romstage-y += vboot_handoff.c common.c verstage-y += verstage.ld VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-VERSTAGE-y)) -VB2_LIB = $(obj)/external/vboot_reference/vboot_fw2.a +VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,$(filter-out -include $(src)/include/kconfig.h, $(CFLAGS_verstage))) VBOOT_CFLAGS += $(verstage-c-ccopts) VBOOT_CFLAGS += -include $(top)/src/include/kconfig.h -Wno-missing-prototypes @@ -48,7 +48,7 @@ $(VB2_LIB): $(obj)/config.h $(MAKE) -C $(VB_SOURCE) \ BUILD=$(top)/$(dir $(VB2_LIB)) \ V=$(V) \ - fwlib2 + fwlib20 VERSTAGE_ELF = $(objcbfs)/verstage.elf cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage |