summaryrefslogtreecommitdiff
path: root/src/arch/arm/armv4
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2013-12-12 20:24:48 -0800
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-09-22 18:46:57 +0200
commit64b9ca9d4eb5eccdea86d967220c67b503a4519b (patch)
treebbe6ca5da122aced6f6a6db22634c76027f34e71 /src/arch/arm/armv4
parent406bad127bf7ac7da25261a30d239751b24e22af (diff)
downloadcoreboot-64b9ca9d4eb5eccdea86d967220c67b503a4519b.tar.xz
arm: Move libgcc assembly macros to arch/asm.h
libgcc/macros.h contains some useful assembly macros that are common in Linux kernel code and facilitate things such as unified ARM/THUMB assembly. This patch moves it to a more general place where it can be used by other code as well. Change-Id: If68e8930aaafa706c54cf9a156fac826b31bb193 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/182178 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> (cherry picked from commit a780670def94a969829811fa8cf257f12b88f085) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6917 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'src/arch/arm/armv4')
-rw-r--r--src/arch/arm/armv4/Makefile.inc3
-rw-r--r--src/arch/arm/armv4/bootblock.S16
2 files changed, 6 insertions, 13 deletions
diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc
index d054b31e4e..aa788688d0 100644
--- a/src/arch/arm/armv4/Makefile.inc
+++ b/src/arch/arm/armv4/Makefile.inc
@@ -19,7 +19,8 @@
##
###############################################################################
-armv4_flags = -marm -march=armv4t -I$(src)/arch/arm/include/armv4/
+armv4_flags = -marm -march=armv4t -I$(src)/arch/arm/include/armv4/ \
+ -D__COREBOOT_ARM_ARCH__=4
###############################################################################
# bootblock
diff --git a/src/arch/arm/armv4/bootblock.S b/src/arch/arm/armv4/bootblock.S
index 3ba2a88e26..58a34cff7e 100644
--- a/src/arch/arm/armv4/bootblock.S
+++ b/src/arch/arm/armv4/bootblock.S
@@ -29,19 +29,10 @@
* MA 02111-1307 USA
*/
-.section ".start", "a", %progbits
-.globl _start
-_start: b reset
- .balignl 16,0xdeadbeef
-
-_cbfs_master_header:
- /* The CBFS master header is inserted by cbfstool at the first
- * aligned offset after the above anchor string is found.
- * Hence, we leave some space for it.
- */
- .skip 128 @ Assumes 64-byte alignment
+#include <arch/asm.h>
-reset:
+.section ".start", "a", %progbits
+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
@@ -84,6 +75,7 @@ call_bootblock:
* wrapper which is currently broken.
*/
bl main
+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