From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 23 Jul 2009 08:24:39 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: s5pc110_universal_support~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23245e471fc824b493789b1487b65d2bdaa4bb2d;p=kernel%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

	cpu/arm_cortexa8/start.S

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

23245e471fc824b493789b1487b65d2bdaa4bb2d
diff --cc cpu/arm_cortexa8/start.S
index da6eed7,6bd6552..af1eeae
--- a/cpu/arm_cortexa8/start.S
+++ b/cpu/arm_cortexa8/start.S
@@@ -520,20 -500,3 +520,4 @@@ finished_inval
  						@ but we compile with armv5
  
  	ldmfd	r13!, {r0 - r5, r7, r9 - r12, pc}
- 
- 
- #if (CONFIG_OMAP34XX)
- 	.align	5
- .global reset_cpu
- reset_cpu:
- 	ldr	r1, rstctl			@ get addr for global reset
- 						@ reg
- 	mov	r3, #0x2			@ full reset pll + mpu
- 	str	r3, [r1]			@ force reset
- 	mov	r0, r0
- _loop_forever:
- 	b	_loop_forever
- rstctl:
- 	.word	PRM_RSTCTRL
- #endif
 +#endif	/* CONFIG_ONENAND_IPL */