summaryrefslogtreecommitdiff
path: root/cpu/mpc85xx/mp.c
diff options
context:
space:
mode:
authorMichael Brandt <Michael.Brandt@stericsson.com>2010-01-13 17:34:25 +0100
committerMichael Brandt <Michael.Brandt@stericsson.com>2010-01-13 17:34:25 +0100
commitc8f05f17eb440b3ef88d9417bf02797475583737 (patch)
tree81e1bf25dd75b1bad7ba738dd15eb76d882912ea /cpu/mpc85xx/mp.c
parent074f516bda136e5464499fc63a854d8469f8e9fb (diff)
parent2ff6922280025c1315c53fa2eb4ab33f0c9591de (diff)
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'cpu/mpc85xx/mp.c')
-rw-r--r--cpu/mpc85xx/mp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c
index 7626eb8e7..6530cb176 100644
--- a/cpu/mpc85xx/mp.c
+++ b/cpu/mpc85xx/mp.c
@@ -165,6 +165,9 @@ static void plat_mp_up(unsigned long bootpg)
e = find_law(bootpg);
out_be32(&ccm->bstrar, LAW_EN | e.trgt_id << 20 | LAW_SIZE_4K);
+ /* readback to sync write */
+ in_be32(&ccm->bstrar);
+
/* disable time base at the platform */
out_be32(&rcpm->ctbenrl, cpu_up_mask);
@@ -309,7 +312,7 @@ void setup_mp(void)
disable_tlb(i);
set_tlb(1, CONFIG_BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */
- MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I, /* perms, wimge */
+ MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, /* perms, wimge */
0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */
memcpy((void *)CONFIG_BPTR_VIRT_ADDR, (void *)fixup, 4096);