GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2015-04-30 14:30:08 +02:00 committed by Patrick Georgi
parent 27ef602fab
commit c41fd4b75c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/arm/armv7/Makefile.inc
View File

@ -91,8 +91,6 @@ verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
## ROM stage ## ROM stage
################################################################################ ################################################################################
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y) ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y)
>>>>>>> 34b838e... armv7-m: add armv7-m configuration
romstage-y += cache.c romstage-y += cache.c
romstage-y += cpu.S romstage-y += cpu.S
romstage-y += exception.c romstage-y += exception.c