ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

[karo-tx-uboot.git] / include / ppc_asm.tmpl

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 9f4029f2afca88d35c074f15c37d914b2328a020..0019d460902c107a361cf059e634234999bfc976 100644 (file)
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -235,7 +235,7 @@
        stw     r22,_CTR(r21);  \
        mfspr   r20,XER;        \
        stw     r20,_XER(r21);  \
-       mfspr   r20,DEAR;       \
+       mfspr   r20, DAR_DEAR;  \
        stw     r20,_DAR(r21);  \
        mfspr   r22,reg1;       \
        mfspr   r23,reg2;       \
@@ -285,7 +285,6 @@ label:                                                              \
        .long   hdlr - _start + _START_OFFSET;                  \
        .long   crit_return - _start + _START_OFFSET
 
-#ifdef CONFIG_440
 #define MCK_EXCEPTION(n, label, hdlr)                          \
        . = n;                                                  \
 label:                                                         \
@@ -299,6 +298,5 @@ label:                                                              \
 .L_ ## label :                                                 \
        .long   hdlr - _start + _START_OFFSET;                  \
        .long   mck_return - _start + _START_OFFSET
-#endif /* CONFIG_440  */
 
 #endif /* __PPC_ASM_TMPL__ */