summaryrefslogtreecommitdiff
path: root/cpu/mpc8260/start.S
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-19 23:01:32 +0000
committerwdenk <wdenk>2003-06-19 23:01:32 +0000
commit48b42616e928ce6eacfe20276a1614e2b27ac4b5 (patch)
tree0c194fbd1059185f158c0b37dc3c846b50c2ee2f /cpu/mpc8260/start.S
parent15ef8a5d17181ea376fac94579dce0af1cfcdeb7 (diff)
downloadu-boot-imx-48b42616e928ce6eacfe20276a1614e2b27ac4b5.zip
u-boot-imx-48b42616e928ce6eacfe20276a1614e2b27ac4b5.tar.gz
u-boot-imx-48b42616e928ce6eacfe20276a1614e2b27ac4b5.tar.bz2
* Patches by David Müller, 12 Jun 2003:
- rewrite of the S3C24X0 register definitions stuff - "driver" for the built-in S3C24X0 RTC * Patches by Yuli Barcohen, 12 Jun 2003: - Add MII support and Ethernet PHY initialization for MPC8260ADS board - Fix incorrect SIUMCR initialisation caused by wrong Hard Reset configuration word supplied by FPGA on some MPC8260ADS boards * Patch by Pantelis Antoniou, 10 Jun 2003: Unify status LED interface
Diffstat (limited to 'cpu/mpc8260/start.S')
-rw-r--r--cpu/mpc8260/start.S13
1 files changed, 13 insertions, 0 deletions
diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S
index 0e6b963..2070ecc 100644
--- a/cpu/mpc8260/start.S
+++ b/cpu/mpc8260/start.S
@@ -161,6 +161,7 @@ _hrcw_table:
.globl _start
_start:
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/
+ nop
b boot_cold
. = EXC_OFF_SYS_RESET + 0x10
@@ -171,6 +172,18 @@ _start_warm:
b boot_warm
boot_cold:
+#if defined(CONFIG_MPC8260ADS)
+ lis r3, CFG_DEFAULT_IMMR@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 */