diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-04-30 14:30:08 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-30 16:15:15 +0200 |
| commit | c41fd4b75c223d1ef44e8b7820a94801752790fc (patch) | |
| tree | 48851d69d2b47ca38e62399b5263db2a27bd113d /src/arch | |
| parent | 27ef602fab2074a5e524f9448b61f5b7c5a7b2d5 (diff) | |
arm/armv7: drop merge left-over
Fixes up commit 93d8e3c4 (armv7-m: add armv7-m configuration).
Change-Id: Ie0b6c90e9ce89d564e3345d2746297f39ba9121d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10042
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/armv7/Makefile.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index 3a71d9844f..3d1043f7d7 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -91,8 +91,6 @@ verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c ## ROM stage ################################################################################ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y) ->>>>>>> 34b838e... armv7-m: add armv7-m configuration - romstage-y += cache.c romstage-y += cpu.S romstage-y += exception.c |