diff options
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) |