Merge 'next' branch

[people/ms/u-boot.git] / cpu / mpc83xx / start.S

diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
index 565cc3972b207c178ace438030ee1c7ed559283f..cd566b2d747d945d3f155adf77022c010a49b423 100644 (file)
--- a/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@ -167,6 +167,18 @@ boot_warm: /* time t 5 */
        /* Initialise the E300 processor core           */
        /*------------------------------------------*/
 
+#ifdef CONFIG_NAND_SPL
+       /* The FCM begins execution after only the first page
+        * is loaded.  Wait for the rest before branching
+        * to another flash page.
+        */
+       addi    r7, r3, 0x50b0
+1:     dcbi    0, r7
+       lwz     r6, 0(r7)
+       andi.   r6, r6, 1
+       beq     1b
+#endif
+
        bl      init_e300_core
 
 #ifdef CONFIG_SYS_FLASHBOOT