From ddcd9bd19fd1a976ea518d2de1e354bb1f53e506 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 27 Apr 2015 18:02:11 +0200 Subject: arch/arm: Move inclusion of timestamps.c to the right directory Without this, building with COLLECT_TIMESTAMPS fails. Fixes a mistake during upstreaming in commit 0de8820. Change-Id: Ie56bd38649a821f6b22a1e5dee5f50ef397035fe Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10002 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Paul Menzel --- src/arch/arm/Makefile.inc | 2 -- src/arch/arm/armv7/Makefile.inc | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index 4e23f84470..d25bc2ee4d 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -62,7 +62,6 @@ bootblock-y += memcpy.S bootblock-y += memmove.S bootblock-y += div0.c bootblock-y += clock.c -bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c $(objcbfs)/bootblock.debug: $$(bootblock-objs) $$(VERSTAGE_LIB) @printf " LINK $(subst $(obj)/,,$(@))\n" @@ -84,7 +83,6 @@ verstage-y += memset.S verstage-y += memcpy.S verstage-y += memmove.S verstage-y += stages.c -verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c ############################################################################### # romstage diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index ba962e9057..e9daf11611 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -59,6 +59,8 @@ bootblock-y += cache_m.c endif # CONFIG_ARCH_BOOTBLOCK_ARMV7 +bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + ################################################################################ ## verification stage ################################################################################ @@ -79,6 +81,8 @@ verstage-S-ccopts += $(armv7-m_asm_flags) endif # CONFIG_ARCH_VERSTAGE_ARMV7_M +verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c + ################################################################################ ## ROM stage ################################################################################ -- cgit v1.2.3