From 901787d6e83b6a5beba5905fbc5441673dcd63e1 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 3 Apr 2005 23:22:21 +0000
Subject: Patch by Jerry Van Baren, 08 Nov 2004: - Add low-boot option for
 MPC8260ADS board (if lowboot is selected,   the jumper for the HRCW source
 should select flash. If lowboot is   not selected, the jumper for the HRCW
 source should select the   BCSR. - change default load base address to
 0x00400000

---
 cpu/mpc8260/start.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpu/mpc8260/start.S')

diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S
index a499bc1e9d..2e93bbbb86 100644
--- a/cpu/mpc8260/start.S
+++ b/cpu/mpc8260/start.S
@@ -172,7 +172,7 @@ _start_warm:
 	b	boot_warm
 
 boot_cold:
-#if defined(CONFIG_MPC8260ADS)
+#if defined(CONFIG_MPC8260ADS) && defined(CFG_DEFAULT_IMMR)
 	lis	r3, CFG_DEFAULT_IMMR@h
 	nop
 	lwz	r4, 0(r3)
@@ -183,7 +183,7 @@ boot_cold:
 	nop
 	stw	r4, 0(r3)
 	nop
-#endif /* CONFIG_MPC8260ADS */
+#endif /* CONFIG_MPC8260ADS && CFG_DEFAULT_IMMR */
 boot_warm:
 	mfmsr	r5			/* save msr contents		*/
 
-- 
cgit v1.2.3