Merge 'next' branch

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

diff --git a/post/lib_ppc/complex.c b/post/lib_ppc/complex.c
index 033584bec087ca530c3de80f88409bfdde4c5cb5..4a3bc0003101a8cea84d29a53fae9c59cd68c754 100644 (file)
--- a/post/lib_ppc/complex.c
+++ b/post/lib_ppc/complex.c
@@ -31,12 +31,10 @@
  * calculations, but probably under different timing conditions, etc.
  */
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CFG_POST_CPU
+#if CONFIG_POST & CONFIG_SYS_POST_CPU
 
 extern int cpu_post_complex_1_asm (int a1, int a2, int a3, int a4, int n);
 extern int cpu_post_complex_2_asm (int x, int n);
@@ -103,6 +101,7 @@ static int cpu_post_test_complex_2 (void)
 int cpu_post_test_complex (void)
 {
     int ret = 0;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -119,8 +118,10 @@ int cpu_post_test_complex (void)
        post_log ("Error at complex test !\n");
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }
 
 #endif
-#endif