Merge branch 'next'

[karo-tx-uboot.git] / post / lib_ppc / asm.S

diff --git a/post/lib_ppc/asm.S b/post/lib_ppc/asm.S
index 5e72b3418f5fcbd360292e8aa7a1144fdf194adf..f6b329aa4df2592f0f52466a2f5ac1fc738a6a63 100644 (file)
--- a/post/lib_ppc/asm.S
+++ b/post/lib_ppc/asm.S
@@ -22,14 +22,12 @@
 
 #include <config.h>
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 
-#if CONFIG_POST & CFG_POST_CPU
+#if CONFIG_POST & CONFIG_SYS_POST_CPU
 
 /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */
        .global cpu_post_exec_02
@@ -308,7 +306,10 @@ cpu_post_exec_31:
        lwz     r3, 0(r4)
        lwz     r4, 0(r5)
        mr      r6, r7
+
+       mfcr    r7
        blrl
+       mtcr    r7
 
        lwz     r7, 8(r1)
        stw     r3, 0(r7)
@@ -355,4 +356,3 @@ cpu_post_complex_2_loop:
 blr
 
 #endif
-#endif