mpc5200, mucmc52, uc101: config cleanup

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

diff --git a/post/lib_ppc/cmpi.c b/post/lib_ppc/cmpi.c
index 92b4d57b1fd140a5fd8ddcdc57cd508be3ecf77f..1a2fc3d094bd5ff70d9d796f84d8c5b04253f693 100644 (file)
--- a/post/lib_ppc/cmpi.c
+++ b/post/lib_ppc/cmpi.c
@@ -39,7 +39,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CFG_POST_CPU
+#if CONFIG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 
@@ -102,6 +102,7 @@ int cpu_post_test_cmpi (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     for (i = 0; i < cpu_post_cmpi_size && ret == 0; i++)
     {
@@ -124,6 +125,9 @@ int cpu_post_test_cmpi (void)
        }
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }