summaryrefslogtreecommitdiff
path: root/src/arch/arm/armv7
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/armv7')
-rw-r--r--src/arch/arm/armv7/Makefile.inc2
-rw-r--r--src/arch/arm/armv7/bootblock.S6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index 2cc42bb63f..033d498d47 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -20,7 +20,7 @@
###############################################################################
armv7_flags = -march=armv7-a -mthumb -mthumb-interwork \
- -I$(src)/arch/arm/include/armv7/
+ -I$(src)/arch/arm/include/armv7/ -D__COREBOOT_ARM_ARCH__=7
###############################################################################
# bootblock
diff --git a/src/arch/arm/armv7/bootblock.S b/src/arch/arm/armv7/bootblock.S
index cfe65e5393..a8d0973034 100644
--- a/src/arch/arm/armv7/bootblock.S
+++ b/src/arch/arm/armv7/bootblock.S
@@ -29,9 +29,10 @@
* MA 02111-1307 USA
*/
+#include <arch/asm.h>
+
.section ".start", "a", %progbits
-.globl _start
-_start:
+ENTRY(_start)
/*
* Set the cpu to System mode with IRQ and FIQ disabled. Prefetch/Data
* aborts may happen early and crash before the abort handlers are
@@ -89,6 +90,7 @@ call_bootblock:
wait_for_interrupt:
wfi
mov pc, lr @ back to my caller
+ENDPROC(_start)
/* we do it this way because it's a 32-bit constant and
* in some cases too far away to be loaded as just an offset