aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/vendorcode/google/chromeos/Makefile.inc12
-rw-r--r--src/vendorcode/google/chromeos/vboot2/Makefile.inc15
2 files changed, 18 insertions, 9 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 36997ed44d..ef36056b33 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,13 +17,25 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
+bootblock-y += chromeos.c
+verstage-y += chromeos.c
+romstage-y += chromeos.c
+ramstage-y += chromeos.c
+
+verstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c
romstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c
ramstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c
+verstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c
romstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c
ramstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c
+verstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += vbnv_flash.c
+romstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += vbnv_flash.c
+ramstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += vbnv_flash.c
+
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
ramstage-$(CONFIG_ELOG) += elog.c
ramstage-y += gnvs.c
+verstage-y += fmap.c
romstage-y += fmap.c
ramstage-y += fmap.c
ramstage-$(CONFIG_CHROMEOS_RAMOOPS) += ramoops.c
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index 3c07a5129e..a29b462842 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -19,19 +19,16 @@
verstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
-ramstage-y += ../vboot_common.c
+bootblock-y += ../vboot_common.c
+verstage-y += ../vboot_common.c
romstage-y += ../vboot_common.c
+ramstage-y += ../vboot_common.c
-ifeq ($(CONFIG_RETURN_FROM_VERSTAGE),y)
-bootblock-y += common.c verstub.c ../chromeos.c ../vboot_common.c
-else
+bootblock-y += verstub.c
verstage-y += verstub.c
-endif
-verstage-y += verstage.c ../fmap.c ../chromeos.c ../vboot_common.c
+bootblock-y += common.c
+verstage-y += verstage.c
verstage-y += antirollback.c common.c
-verstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += ../vbnv_cmos.c
-verstage-$(CONFIG_CHROMEOS_VBNV_EC) += ../vbnv_ec.c
-verstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += ../vbnv_flash.c
romstage-y += vboot_handoff.c common.c
verstage-y += verstage.ld