rename CFG_ macros to CONFIG_SYS

[oweals/u-boot.git] / post / lib_ppc / multi.c

diff --git a/post/lib_ppc/multi.c b/post/lib_ppc/multi.c
index 872438478fe445d2e19afdb1a476975170c74e4c..e42a7c07ebe4b60f373898cf78ed288cabc5b0d6 100644 (file)
--- a/post/lib_ppc/multi.c
+++ b/post/lib_ppc/multi.c
@@ -33,12 +33,10 @@
  * of the source and target buffers are then compared.
  */
 
-#ifdef CONFIG_POST
-
 #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_02 (ulong *code, ulong op1, ulong op2);
 
@@ -46,6 +44,7 @@ int cpu_post_test_multi (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -74,8 +73,10 @@ int cpu_post_test_multi (void)
        post_log ("Error at multi test !\n");
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }
 
 #endif
-#endif