summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2014-04-30 19:21:11 +0200
committerYork Sun <yorksun@freescale.com>2014-05-13 08:26:56 -0700
commita6c46b994d90f892b608b1b233a04f1fc54f7ab7 (patch)
tree4fa25c00a117c1d918d67faaf2dcdbea73660201
parentb539534d120c3f017965b25aa36fcfb75db8383c (diff)
downloadu-boot-imx-a6c46b994d90f892b608b1b233a04f1fc54f7ab7.zip
u-boot-imx-a6c46b994d90f892b608b1b233a04f1fc54f7ab7.tar.gz
u-boot-imx-a6c46b994d90f892b608b1b233a04f1fc54f7ab7.tar.bz2
PPC 85xx QEMU: Don't use HID1
For the QEMU machine type, we can plug in either e500v2, e500mc, e5500 or e6500 style cores into the system. U-boot has to work with all of them. So avoid using HID1 which is not available on e500mc systems to make sure we don't trap on it. Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--arch/powerpc/cpu/mpc85xx/start.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index 0e3c86a..0149146 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