From 28a41a6ab20b56383b29f2e37443d21527f3fbd9 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 23 Jul 2014 14:08:06 -0700 Subject: [PATCH] vboot: Makefile updates for arm64 Add memset and memcpy to VBOOT_STUB_DEFS and add vbnv_ec to romstage and ramstage for arm64 BUG=chrome-os-partner:30784 BRANCH=None TEST=Compiles successfully for rush Change-Id: Ib65bae96a86b78ed7770efd084a29f61b3370fee Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/209976 Reviewed-by: Aaron Durbin Commit-Queue: Furquan Shaikh Tested-by: Furquan Shaikh --- src/vendorcode/google/chromeos/Makefile.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 45a62f3b77..450d283915 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -23,6 +23,8 @@ romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv_cmos.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv_cmos.c romstage-$(CONFIG_ARCH_ROMSTAGE_ARM) += vbnv_ec.c ramstage-$(CONFIG_ARCH_RAMSTAGE_ARM) += vbnv_ec.c +romstage-$(CONFIG_ARCH_ROMSTAGE_ARM64) += vbnv_ec.c +ramstage-$(CONFIG_ARCH_RAMSTAGE_ARM64) += vbnv_ec.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c ramstage-$(CONFIG_ELOG) += elog.c ramstage-y += gnvs.c @@ -79,6 +81,10 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM),y) VBOOT_STUB_DEPS += $(obj)/arch/arm/memset.rmodules_$(ARCH-ROMSTAGE-y).o VBOOT_STUB_DEPS += $(obj)/arch/arm/memcpy.rmodules_$(ARCH-ROMSTAGE-y).o endif +ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y) +VBOOT_STUB_DEPS += $(obj)/lib/memset.rmodules.o +VBOOT_STUB_DEPS += $(obj)/lib/memcpy.rmodules.o +endif VBOOT_STUB_DEPS += $(VB_LIB) # Remove the '-include' option since that will break vboot's build and ensure # vboot_reference can get to coreboot's include files.