diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
| commit | b4f15fdaf77b7339e2984703c83269c7cdf680a9 (patch) | |
| tree | 32bb3b65d98a229aead643ae11ef2dc433146411 /cpu/mpc85xx/start.S | |
| parent | b20d00328c5486a4b2cdf07ce7afaf2139dc741e (diff) | |
| parent | 07a2505f67e091ff70506ae6a5022b416211df44 (diff) | |
| download | u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.zip u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.tar.gz u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.tar.bz2 | |
Merge with /home/wd/git/u-boot/jon_loeliger
Diffstat (limited to 'cpu/mpc85xx/start.S')
| -rw-r--r-- | cpu/mpc85xx/start.S | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index af28ebe..5f75bc1 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -155,11 +155,13 @@ _start_e500: mtspr MCSR,r0 mtspr DEAR,r0 - mtspr DBCR0,r0 + /* not needed and conflicts with some debuggers */ + /* mtspr DBCR0,r0 */ mtspr DBCR1,r0 mtspr DBCR2,r0 - mtspr IAC1,r0 - mtspr IAC2,r0 + /* not needed and conflicts with some debuggers */ + /* mtspr IAC1,r0 */ + /* mtspr IAC2,r0 */ mtspr DAC1,r0 mtspr DAC2,r0 @@ -174,6 +176,9 @@ _start_e500: mtspr BUCSR,r0 /* disable branch prediction */ mtspr MAS4,r0 mtspr MAS6,r0 +#if defined(CONFIG_ENABLE_36BIT_PHYS) + mtspr MAS7,r0 +#endif isync /* Setup interrupt vectors */ @@ -358,6 +363,9 @@ _start: /* Enable Time Base and Select Time Base Clock */ lis r0,HID0_EMCP@h /* Enable machine check */ ori r0,r0,0x4000 /* time base is processor clock */ +#if defined(CONFIG_ENABLE_36BIT_PHYS) + ori r0,r0,0x0080 /* enable MAS7 updates */ +#endif mtspr HID0,r0 #if defined(CONFIG_ADDR_STREAMING) |