aboutsummaryrefslogtreecommitdiffstats
path: root/src/vendorcode/google/chromeos/vboot2/Makefile.inc
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-30 14:25:14 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-30 15:39:53 +0200
commit27ef602fab2074a5e524f9448b61f5b7c5a7b2d5 (patch)
tree0439e10c5b96ed3b7f7a0d58ae7c988936bba34e /src/vendorcode/google/chromeos/vboot2/Makefile.inc
parent8ef8afbb38734fea50b926c94e994b2682328a0d (diff)
downloadcoreboot-27ef602fab2074a5e524f9448b61f5b7c5a7b2d5.tar.gz
coreboot-27ef602fab2074a5e524f9448b61f5b7c5a7b2d5.tar.xz
coreboot-27ef602fab2074a5e524f9448b61f5b7c5a7b2d5.zip
vboot: split class in library and stage
The build system includes a bunch of files into verstage that also exist in romstage - generic drivers etc. These create link time conflicts when trying to link both the verstage copy and romstage copy together in a combined configuration, so separate "stage" parts (that allow things to run) from "library" parts (that contain the vboot specifics). Change-Id: Ieed910fcd642693e5e89e55f3e6801887d94462f Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/10041 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/vendorcode/google/chromeos/vboot2/Makefile.inc')
-rw-r--r--src/vendorcode/google/chromeos/vboot2/Makefile.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index 4c53aed56..29115de69 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -17,7 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-verstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
+libverstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
bootblock-y += ../vboot_common.c
verstage-y += ../vboot_common.c
@@ -25,14 +25,14 @@ romstage-y += ../vboot_common.c
ramstage-y += ../vboot_common.c
bootblock-y += verstub.c
-verstage-y += verstub.c
+libverstage-y += verstub.c
bootblock-y += common.c
-verstage-y += verstage.c
+libverstage-y += verstage.c
verstage-y += common.c
ifeq (${CONFIG_VBOOT2_MOCK_SECDATA},y)
-verstage-y += secdata_mock.c
+libverstage-y += secdata_mock.c
else
-verstage-y += antirollback.c
+libverstage-y += antirollback.c
endif
romstage-y += vboot_handoff.c common.c
@@ -41,7 +41,7 @@ verstage-y += verstage.ld
VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-VERSTAGE-y))
VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a
VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,$(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_verstage)))
-VBOOT_CFLAGS += $(verstage-c-ccopts)
+VBOOT_CFLAGS += $(libverstage-c-ccopts)
VBOOT_CFLAGS += -include $(top)/src/include/kconfig.h -Wno-missing-prototypes
VBOOT_CFLAGS += -DVBOOT_DEBUG
@@ -55,7 +55,7 @@ $(VB2_LIB): $(obj)/config.h
V=$(V) \
fwlib20
-verstage-srcs += $(VB2_LIB)
+libverstage-srcs += $(VB2_LIB)
ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage