diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:46 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:46 -0500 |
| commit | a941b832411ef99351a42be23ff3319643dcc1a4 (patch) | |
| tree | 1cdaa7e1e82679a5acf20676960df2b0d91d94b2 /cpu/mpc86xx/start.S | |
| parent | 72ed528a948b151e7be5ce03ed3d2b88a229dd0a (diff) | |
| parent | c83ae9ea6d93abbe751bf8a3396236a084e56f87 (diff) | |
Merge branch 'mpc86xx'
Diffstat (limited to 'cpu/mpc86xx/start.S')
| -rw-r--r-- | cpu/mpc86xx/start.S | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S index b96363151d..07e75572b9 100644 --- a/cpu/mpc86xx/start.S +++ b/cpu/mpc86xx/start.S @@ -207,11 +207,7 @@ boot_warm: /* init the L2 cache */ addis r3, r0, L2_INIT@h ori r3, r3, L2_INIT@l - sync mtspr l2cr, r3 -#ifdef CONFIG_ALTIVEC - dssall -#endif /* invalidate the L2 cache */ bl l2cache_invalidate sync @@ -245,6 +241,13 @@ in_flash: bl setup_ccsrbar #endif + /* Fix for SMP linux - Changing arbitration to round-robin */ + lis r3, CFG_CCSRBAR@h + ori r3, r3, 0x1000 + xor r4, r4, r4 + li r4, 0x1000 + stw r4, 0(r3) + /* setup the law entries */ bl law_entry sync @@ -280,9 +283,9 @@ in_flash: /* make sure timer enabled in guts register too */ lis r3, CFG_CCSRBAR@h oris r3,r3, 0xE - ori r3,r3,0x0070 /*Jason from 3*/ + ori r3,r3,0x0070 lwz r4, 0(r3) - lis r5,0xFFFC /*Jason from 0xffff*/ + lis r5,0xFFFC ori r5,r5,0x5FFF and r4,r4,r5 stw r4,0(r3) |