From 50689461205e0125759eb1a43787383a3fa09b48 Mon Sep 17 00:00:00 2001 From: "mario.six@gdsys.cc" Date: Tue, 5 Apr 2016 15:05:37 +0200 Subject: powerpc: mpc85xx: Enable pre-relocation malloc for MPC85xx To enable DM on MPC85xx, we need pre-relocation malloc, which is implemented in this patch. We also make sure that the IVORs are always 4-aligned on e500 to prevent alignment exceptions caused by code changes in start.S. Signed-off-by: Mario Six Cc: York Sun Cc: Simon Glass Reviewed-by: York Sun --- include/ppc_asm.tmpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/ppc_asm.tmpl') diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl index ba166eb..379c493 100644 --- a/include/ppc_asm.tmpl +++ b/include/ppc_asm.tmpl @@ -263,12 +263,14 @@ b transfer_to_handler #define STD_EXCEPTION(n, label, hdlr) \ +.align 4; \ label: \ EXCEPTION_PROLOG(SRR0, SRR1); \ addi r3,r1,STACK_FRAME_OVERHEAD; \ EXC_XFER_TEMPLATE(n, label, hdlr, MSR_KERNEL, NOCOPY) \ #define CRIT_EXCEPTION(n, label, hdlr) \ +.align 4; \ label: \ EXCEPTION_PROLOG(CSRR0, CSRR1); \ addi r3,r1,STACK_FRAME_OVERHEAD; \ @@ -276,6 +278,7 @@ label: \ MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE), NOCOPY) \ #define MCK_EXCEPTION(n, label, hdlr) \ +.align 4; \ label: \ EXCEPTION_PROLOG(MCSRR0, MCSRR1); \ addi r3,r1,STACK_FRAME_OVERHEAD; \ -- cgit v1.1