Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / ArmPlatformPkg / PrePi / ModuleEntryPoint.S

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index ed44710a60e8ab12e1d3b8f6cd6df5882e7f8ead..75728c983fef016ac03f33ad8cbcda7dc07d246b 100755 (executable)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -127,10 +127,10 @@ _SetGlobals:
   mov   r3, sp\r
   mov   r2, #0x0\r
 _InitGlobals:\r
-  str   r2, [r3], #4\r
   cmp   r3, r1\r
-  bne   _InitGlobals\r
-\r
+  beq   _PrepareArguments\r
+  str   r2, [r3], #4\r
+  b     _InitGlobals\r
 \r
 _PrepareArguments:\r
   mov   r0, r5\r