Fix merge problems

[u-boot] / post / lib_ppc / rlwimi.c

diff --git a/post/lib_ppc/rlwimi.c b/post/lib_ppc/rlwimi.c
index f65f79a8e84dae8bcda9dcb810316a9f6eed16ce..8662db16cdc62f2f0bb54647d12a3ff6be95d848 100644 (file)
--- a/post/lib_ppc/rlwimi.c
+++ b/post/lib_ppc/rlwimi.c
@@ -32,8 +32,6 @@
  * different sets of operand registers and result registers.
  */
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 #include "cpu_asm.h"
 
@@ -55,7 +53,7 @@ static struct cpu_post_rlwimi_s
 } cpu_post_rlwimi_table[] =
 {
     {
-       OP_RLWIMI,
+       OP_RLWIMI,
        0xff00ffff,
        0x0000aa00,
        8,
@@ -82,7 +80,7 @@ int cpu_post_test_rlwimi (void)
            unsigned int reg0 = (reg + 0) % 32;
            unsigned int reg1 = (reg + 1) % 32;
            unsigned int stk = reg < 16 ? 31 : 15;
-           unsigned long code[] =
+           unsigned long code[] =
            {
                ASM_STW(stk, 1, -4),
                ASM_ADDI(stk, 1, -20),
@@ -101,7 +99,7 @@ int cpu_post_test_rlwimi (void)
                ASM_LWZ(stk, 1, -4),
                ASM_BLR,
            };
-           unsigned long codecr[] =
+           unsigned long codecr[] =
            {
                ASM_STW(stk, 1, -4),
                ASM_ADDI(stk, 1, -20),
@@ -126,26 +124,26 @@ int cpu_post_test_rlwimi (void)
 
            if (ret == 0)
            {
-               cr = 0;
-               cpu_post_exec_22 (code, & cr, & res, test->op0, test->op1);
+               cr = 0;
+               cpu_post_exec_22 (code, & cr, & res, test->op0, test->op1);
 
-               ret = res == test->res && cr == 0 ? 0 : -1;
+               ret = res == test->res && cr == 0 ? 0 : -1;
 
-               if (ret != 0)
-               {
+               if (ret != 0)
+               {
                    post_log ("Error at rlwimi test %d !\n", i);
-               }
+               }
            }
 
            if (ret == 0)
            {
-               cpu_post_exec_22 (codecr, & cr, & res, test->op0, test->op1);
+               cpu_post_exec_22 (codecr, & cr, & res, test->op0, test->op1);
 
-               ret = res == test->res &&
+               ret = res == test->res &&
                      (cr & 0xe0000000) == cpu_post_makecr (res) ? 0 : -1;
 
-               if (ret != 0)
-               {
+               if (ret != 0)
+               {
                    post_log ("Error at rlwimi test %d !\n", i);
                }
            }
@@ -153,10 +151,9 @@ int cpu_post_test_rlwimi (void)
     }
 
     if (flag)
-       enable_interrupts();
+       enable_interrupts();
 
     return ret;
 }
 
 #endif
-#endif