aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-27 18:02:11 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-28 10:19:53 +0200
commitddcd9bd19fd1a976ea518d2de1e354bb1f53e506 (patch)
tree26a3c86213f3ee039f65877608a79149db3c0b92 /src/arch
parentef345c26a73e64c4faa07026c300429e51228b9e (diff)
downloadcoreboot-ddcd9bd19fd1a976ea518d2de1e354bb1f53e506.tar.gz
coreboot-ddcd9bd19fd1a976ea518d2de1e354bb1f53e506.tar.xz
coreboot-ddcd9bd19fd1a976ea518d2de1e354bb1f53e506.zip
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 <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/10002 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/Makefile.inc2
-rw-r--r--src/arch/arm/armv7/Makefile.inc4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc
index 4e23f8447..d25bc2ee4 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 ba962e905..e9daf1161 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
################################################################################