[U-Boot-Users] Patch: Fix for incorrect HRCW on MPC8260ADS

[Yuli Barcohen]

Hi,

On some MPC8260ADS boards, the FPGA (BCSR) supplies Hardware Reset
Configuration Word (HRCW) which disables BADDR29-31 pins. As a result of
this initialisation, every command must be 8-byte aligned to be
fetched. Of course, PPC commands are 4-byte aligned so the board simply
does not work. Attached patch fixes the problem by changing
SIUMCR. Patch's commands are 8-byte aligned by nops.
-- 
========================================================================
 Yuli Barcohen       | Phone +972-9-765-1788 |  Software Project Leader
 yuli at arabellasw.com | Fax   +972-9-765-7494 | Arabella Software, Israel
========================================================================
-------------- next part --------------
--- cpu/mpc8260/start.S	2003-06-12 12:25:22.000000000 +0300
+++ Arabella/u-boot/cpu/mpc8260/start.S	2003-06-12 13:43:18.000000000 +0300
@@ -161,9 +161,9 @@ _hrcw_table:
 	.globl	_start
 _start:
 	li	r21, BOOTFLAG_COLD	/* Normal Power-On: Boot from FLASH*/
+	nop
 	b	boot_cold
-
-	. = EXC_OFF_SYS_RESET + 0x10
+	nop
 
 	.globl	_start_warm
 _start_warm:
@@ -171,6 +171,18 @@ _start_warm:
 	b	boot_warm
 
 boot_cold:
+#if defined(CONFIG_MPC8260ADS)
+	lis	r3, CFG_DEFAULT_IMMR at h
+	nop
+	lwz	r4, 0(r3)
+	nop
+	rlwinm	r4, r4, 0, 8, 5
+	nop
+	oris	r4, r4, 0x0200
+	nop
+	stw	r4, 0(r3)
+	nop
+#endif /* CONFIG_MPC8260ADS */
 boot_warm:
 	mfmsr	r5			/* save msr contents		*/
 
-------------- next part --------------
Fix incorrect SIUMCR initialisation caused by wrong Hard Reset
configuration word supplied by FPGA on some MPC8260ADS boards