diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-27 22:31:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-27 22:31:32 +0100 |
| commit | f8030519bbe20b836f3939742b959cbadfaad51b (patch) | |
| tree | ae23fde6c7c196fca5fb62d6e30103974179d961 /cpu/mpc85xx/start.S | |
| parent | 5deb8022c3749faac30e9ad9694691e2442b5c93 (diff) | |
| parent | c2083e0e11a03ef8be2e9f0ed8720fdc20832f3e (diff) | |
| download | u-boot-imx-f8030519bbe20b836f3939742b959cbadfaad51b.zip u-boot-imx-f8030519bbe20b836f3939742b959cbadfaad51b.tar.gz u-boot-imx-f8030519bbe20b836f3939742b959cbadfaad51b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu/mpc85xx/start.S')
| -rw-r--r-- | cpu/mpc85xx/start.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index fc3c336..651ff1c 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -163,8 +163,10 @@ _start_e500: ori r0,r0,HID0_TBEN@l /* Enable Timebase */ mtspr HID0,r0 +#ifndef CONFIG_E500MC li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ mtspr HID1,r0 +#endif /* Enable Branch Prediction */ #if defined(CONFIG_BTB) @@ -998,8 +1000,8 @@ trap_reloc: .globl unlock_ram_in_cache unlock_ram_in_cache: /* invalidate the INIT_RAM section */ - lis r3,(CONFIG_SYS_INIT_RAM_ADDR & ~31)@h - ori r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~31)@l + lis r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@h + ori r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~(CONFIG_SYS_CACHELINE_SIZE-1))@l mfspr r4,L1CFG0 andi. r4,r4,0x1ff slwi r4,r4,(10 - 1 - L1_CACHE_SHIFT) |