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
 ################################################################################