From: Wolfgang Denk <wd@denx.de>
Date: Sat, 18 Oct 2008 19:59:44 +0000 (+0200)
Subject: Merge 'next' branch
X-Git-Tag: v2009.01-rc1~157^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f82642e33899766892499b163e60560fbbf87773;p=u-boot

Merge 'next' branch

Conflicts:

	board/freescale/mpc8536ds/mpc8536ds.c
	include/configs/mgcoge.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

f82642e33899766892499b163e60560fbbf87773
diff --cc cpu/mpc83xx/start.S
index 6ff6682622,565cc3972b..cd566b2d74
--- a/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@@ -167,21 -167,9 +167,21 @@@ 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 CFG_FLASHBOOT
+ #ifdef CONFIG_SYS_FLASHBOOT
  
  	/* Inflate flash location so it appears everywhere, calculate */
  	/* the absolute address in final location of the FLASH, jump  */