Merge branch 'i2c'

[u-boot] / include / ppc_asm.tmpl

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 0e0bde5b99dd78c514936ad4c99169f8151e7466..3e47e82abadf31b8defee302c3340cf354263f20 100644 (file)
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -175,6 +175,11 @@
 #define IM_IMMR                (IM_REGBASE+0x01a8)
 #define IM_SCCR                (IM_REGBASE+0x0c80)
 
+#elif defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8220)
+
+#define HID0_ICE_BITPOS        16
+#define HID0_DCE_BITPOS        17
+
 #endif
 
 #define curptr r2
@@ -307,7 +312,7 @@ label:                                                  \
        lwz     r3,GOT(transfer_to_handler);            \
        mtlr    r3;                                     \
        addi    r3,r1,STACK_FRAME_OVERHEAD;             \
-       li      r20,MSR_KERNEL;                         \
+       li      r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)); \
        rlwimi  r20,r23,0,25,25;                        \
        blrl    ;                                       \
 .L_ ## label :                                          \