diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-15 21:37:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-15 21:37:23 +0200 |
| commit | 1d28d48e3df65ef867395eb84ee0498f1c52a384 (patch) | |
| tree | 155cb75e5f73083f0b77a10679608808c8d7437a /cpu/mpc85xx/start.S | |
| parent | 85e5808e8ea9f77da5219f23394112f0b424fa5e (diff) | |
| parent | 1107014e835ec9d46c0333f4211d104f77442db0 (diff) | |
| download | u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.zip u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.tar.gz u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index 2b5d90e..10fe936 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -188,11 +188,12 @@ _start_e500: lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16M)@h ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16M)@l - lis r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@h - ori r8,r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@l + /* Align the mapping to 16MB */ + lis r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xff000000, (MAS2_I|MAS2_G))@h + ori r8,r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xff000000, (MAS2_I|MAS2_G))@l - lis r9,FSL_BOOKE_MAS3(0xff800000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h - ori r9,r9,FSL_BOOKE_MAS3(0xff800000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l + lis r9,FSL_BOOKE_MAS3(0xff000000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(0xff000000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l mtspr MAS0,r6 mtspr MAS1,r7 |