diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-07 22:33:06 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-07 22:33:06 +0200 |
| commit | 3df4f46f3209c067dcadc969ed02d27c97fa3632 (patch) | |
| tree | 4639307e5e9120b0c80c62da8376be3e406e84fb /arch/powerpc/cpu/mpc85xx/start.S | |
| parent | 9efac4a1eb99d9c5539aa6992025eeacab7980c6 (diff) | |
| parent | c519facc645812c6d174c2d5b60241d23e285642 (diff) | |
| download | olio-uboot-2014.01-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.xz olio-uboot-2014.01-3df4f46f3209c067dcadc969ed02d27c97fa3632.zip | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/start.S')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index b3cb56a5b..3278b109f 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -330,8 +330,18 @@ _start_e500: lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_INIT_RAM_ADDR, 0)@h ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_INIT_RAM_ADDR, 0)@l +#if defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW) && \ + defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH) + lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@l + li r10,CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH + mtspr MAS7,r10 +#else lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_INIT_RAM_ADDR, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_INIT_RAM_ADDR, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l +#endif mtspr MAS0,r6 mtspr MAS1,r7 |