diff options
| author | Julius Werner <jwerner@chromium.org> | 2013-12-12 20:24:48 -0800 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-09-22 18:46:57 +0200 |
| commit | 64b9ca9d4eb5eccdea86d967220c67b503a4519b (patch) | |
| tree | bbe6ca5da122aced6f6a6db22634c76027f34e71 /payloads/libpayload/arch/arm | |
| parent | 406bad127bf7ac7da25261a30d239751b24e22af (diff) | |
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 'payloads/libpayload/arch/arm')
| -rw-r--r-- | payloads/libpayload/arch/arm/head.S | 20 | ||||
| -rw-r--r-- | payloads/libpayload/arch/arm/util.S | 8 |
2 files changed, 13 insertions, 15 deletions
diff --git a/payloads/libpayload/arch/arm/head.S b/payloads/libpayload/arch/arm/head.S index 7a706e3aa6..0d23c7256f 100644 --- a/payloads/libpayload/arch/arm/head.S +++ b/payloads/libpayload/arch/arm/head.S @@ -27,17 +27,16 @@ * SUCH DAMAGE. */ - .global _entry, _leave - .text - .align 4 +#include <arch/asm.h> 1: +.align 4 .word _stack /* * Our entry point */ -_entry: +ENTRY(_entry) /* TODO: disable interrupts */ @@ -46,14 +45,15 @@ _entry: /* Setup new stack */ ldr sp, 1b - /* TODO: Save old stack pointer */ + /* TODO: Save old stack pointer and link register */ /* Let's rock. */ - b start_main + bl start_main - /* %eax has the return value - pass it on unmolested */ -_leave: - /* TODO: restore old stack pointer. */ + /* %r0 has the return value - pass it on unmolested */ + + /* TODO: restore old stack pointer and link register */ /* Return to the original context. */ - mov pc, lr + bx lr +ENDPROC(_entry) diff --git a/payloads/libpayload/arch/arm/util.S b/payloads/libpayload/arch/arm/util.S index e3f173eb2d..7c14a39a4f 100644 --- a/payloads/libpayload/arch/arm/util.S +++ b/payloads/libpayload/arch/arm/util.S @@ -27,11 +27,9 @@ * SUCH DAMAGE. */ - .global halt - .text - .align 4 +#include <arch/asm.h> /* This function puts the system into a halt. */ - .type halt, function -halt: +ENTRY(halt) b halt +ENDPROC(halt) |