X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=post%2Flib_ppc%2Fstring.c;h=c0ddeaf6550ca850a9cc82fcbc0ed91c3c65d0ea;hb=e4430779623af500de1cee7892c379f07ef59813;hp=b2daa8804968ea628268235bea4e14e31d6ecedd;hpb=0a51e9248e2d27e0a02ef1e740c576ce90a39ee1;p=u-boot

diff --git a/post/lib_ppc/string.c b/post/lib_ppc/string.c
index b2daa88049..c0ddeaf655 100644
--- a/post/lib_ppc/string.c
+++ b/post/lib_ppc/string.c
@@ -36,7 +36,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_02 (ulong *code, ulong op1, ulong op2);
 extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,
@@ -47,6 +47,7 @@ int cpu_post_test_string (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -97,6 +98,9 @@ int cpu_post_test_string (void)
 	post_log ("Error at string test !\n");
     }
 
+    if (flag)
+	enable_interrupts();
+
     return ret;
 }