Merge 'next' branch

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

diff --git a/post/lib_ppc/load.c b/post/lib_ppc/load.c
index 393c56830d9d6cd4aa445df1880c629a30b6a8b0..98d437318c6956c8a8c5d2ddbdc150178fcc634a 100644 (file)
--- a/post/lib_ppc/load.c
+++ b/post/lib_ppc/load.c
@@ -41,12 +41,10 @@
  * register (it must change for "load with update" instructions).
  */
 
-#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_22w (ulong *code, ulong *op1, ulong op2, ulong *op3);
 extern void cpu_post_exec_21w (ulong *code, ulong *op1, ulong *op2);
@@ -180,6 +178,7 @@ int cpu_post_test_load (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     for (i = 0; i < cpu_post_load_size && ret == 0; i++)
     {
@@ -248,8 +247,10 @@ int cpu_post_test_load (void)
        }
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }
 
 #endif
-#endif