aboutsummaryrefslogtreecommitdiffstats
path: root/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 /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 'Makefile.inc')
-rw-r--r--Makefile.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 8c32c0823..64039771f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -64,7 +64,7 @@ subdirs-y += site-local
#######################################################################
# Add source classes and their build options
-classes-y := ramstage romstage bootblock smm smmstub cpu_microcode verstage secmon
+classes-y := ramstage romstage bootblock smm smmstub cpu_microcode libverstage verstage secmon
# Add dynamic classes for rmodules
$(foreach supported_arch,$(ARCH_SUPPORTED), \
@@ -138,6 +138,7 @@ endif
ramstage-c-deps:=$$(OPTION_TABLE_H)
romstage-c-deps:=$$(OPTION_TABLE_H)
+libverstage-c-deps:=$$(OPTION_TABLE_H)
verstage-c-deps:=$$(OPTION_TABLE_H)
bootblock-c-deps:=$$(OPTION_TABLE_H)
@@ -362,7 +363,7 @@ $(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h
@printf " CC $(subst $(obj)/,,$(@))\n"
$(CC_bootblock) -MMD $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) $(bootblock-c-ccopts) -c -o $@ $<
-$(objgenerated)/libverstage.a: $$(verstage-objs)
+$(objgenerated)/libverstage.a: $$(libverstage-objs)
rm -f $@
ar rcsT $@ $^