Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10042
-gerrit
commit 140c2733154075f3c7b0712adc147a29cef763b6 Author: Patrick Georgi pgeorgi@chromium.org Date: Thu Apr 30 14:30:08 2015 +0200
arm/armv7: drop merge left-over
Change-Id: Ie0b6c90e9ce89d564e3345d2746297f39ba9121d Signed-off-by: Patrick Georgi pgeorgi@chromium.org --- src/arch/arm/armv7/Makefile.inc | 2 -- 1 file changed, 2 deletions(-)
diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index 3a71d98..3d1043f 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