summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-21 01:13:52 +0200
committerWolfgang Denk <wd@denx.de>2008-05-21 01:13:52 +0200
commit0ad4770f8eb052a84800925ea4ab342cfc10dc32 (patch)
treefa5f76ccbb17959c94b47e98548a95daf2144fa9 /cpu
parenteddc7c46c6030d6eca29ac254c9db98198be572d (diff)
parent2f845dc2bdf461bfee9fa25823f769f5db9eba0b (diff)
downloadu-boot-imx-0ad4770f8eb052a84800925ea4ab342cfc10dc32.zip
u-boot-imx-0ad4770f8eb052a84800925ea4ab342cfc10dc32.tar.gz
u-boot-imx-0ad4770f8eb052a84800925ea4ab342cfc10dc32.tar.bz2
Merge branch 'socrates' of /home/wd/git/u-boot/projects
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc85xx/cpu.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index 74b210c..9873383 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -174,28 +174,33 @@ int do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
{
uint pvr;
uint ver;
+ unsigned long val, msr;
+
pvr = get_pvr();
ver = PVR_VER(pvr);
+
if (ver & 1){
/* e500 v2 core has reset control register */
volatile unsigned int * rstcr;
rstcr = (volatile unsigned int *)(CFG_IMMR + 0xE00B0);
*rstcr = 0x2; /* HRESET_REQ */
- }else{
+ udelay(100);
+ }
+
/*
+ * Fallthrough if the code above failed
* Initiate hard reset in debug control register DBCR0
* Make sure MSR[DE] = 1
*/
- unsigned long val, msr;
- msr = mfmsr ();
- msr |= MSR_DE;
- mtmsr (msr);
+ msr = mfmsr ();
+ msr |= MSR_DE;
+ mtmsr (msr);
+
+ val = mfspr(DBCR0);
+ val |= 0x70000000;
+ mtspr(DBCR0,val);
- val = mfspr(DBCR0);
- val |= 0x70000000;
- mtspr(DBCR0,val);
- }
return 1;
}