diff options
| author | Tom Rini <trini@ti.com> | 2014-05-13 17:09:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 17:09:28 -0400 |
| commit | 557a3319089499aa0e55d65a6b43b7137f362003 (patch) | |
| tree | 092341615ca6449473e4d9f7cb2158391bb86892 /arch/powerpc/cpu/mpc85xx/start.S | |
| parent | 27b4e4b9913f65b52d20485dff3f8800bf78f3d7 (diff) | |
| parent | 8ad5d45e0044f5e64dbe7c6bd4e6aa0121a26b23 (diff) | |
| download | u-boot-imx-557a3319089499aa0e55d65a6b43b7137f362003.zip u-boot-imx-557a3319089499aa0e55d65a6b43b7137f362003.tar.gz u-boot-imx-557a3319089499aa0e55d65a6b43b7137f362003.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/start.S')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 0e3c86a..d8c9fb6 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -314,7 +314,7 @@ l2_disabled: #endif mtspr HID0,r0 -#ifndef CONFIG_E500MC +#if !defined(CONFIG_E500MC) && !defined(CONFIG_QEMU_E500) li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ mfspr r3,PVR andi. r3,r3, 0xff @@ -1158,7 +1158,7 @@ _start_cont: mtmsr r3 isync - bl cpu_init_f + bl cpu_init_f /* return boot_flag for calling board_init_f */ bl board_init_f isync |