From afe9c8a03bdd682dc160d7c33102159c5aef5247 Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Thu, 25 Dec 2014 09:59:29 +0800 Subject: [PATCH] vboot1: Fix compilation error with CONFIG_ARCH_ROMSTAGE_ARM64 enabled make: *** No rule to make target `build/lib/memset.rmodules.o', needed by `build/vendorcode/google/chromeos/vboot1/vbootstub.elf'. Stop. Fix the error by refering to ./src/arch/arm64/Makefile.inc: rmodules_arm64-y += ../../lib/memset.c rmodules_arm64-y += ../../lib/memcpy.c BRANCH=none BUG=none TEST=build pass on our own MT8173 board Change-Id: Ic870136db1ec9405e3d30caf6085f056bc46a5c2 Signed-off-by: Stefan Reinauer Original-Commit-Id: d317dbe8732abbf7e785466e7d1e07425aac326f Original-Change-Id: I69a7db83154a23f7878e9c604c9b541fb6fa308d Original-Reviewed-on: https://chromium-review.googlesource.com/237974 Original-Reviewed-by: Stefan Reinauer Original-Reviewed-by: Furquan Shaikh Original-Commit-Queue: Yidi Lin Original-Tested-by: Yidi Lin Reviewed-on: http://review.coreboot.org/9591 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/vendorcode/google/chromeos/vboot1/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vendorcode/google/chromeos/vboot1/Makefile.inc b/src/vendorcode/google/chromeos/vboot1/Makefile.inc index a2d42b45f3..4f7de9017c 100644 --- a/src/vendorcode/google/chromeos/vboot1/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot1/Makefile.inc @@ -48,8 +48,8 @@ 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 +VBOOT_STUB_DEPS += $(obj)/lib/memset.rmodules_$(ARCH-ROMSTAGE-y).o +VBOOT_STUB_DEPS += $(obj)/lib/memcpy.rmodules_$(ARCH-ROMSTAGE-y).o endif VBOOT_STUB_DEPS += $(VB_LIB) # Remove the '-include' option since that will break vboot's build and ensure